Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 22626)
+++ applications/editors/josm/i18n/po/ar.po	(revision 22628)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 12:34+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-07 00:16+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -26,6 +26,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -223,4 +223,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -232,4 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -239,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -294,5 +296,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "إلغاء"
@@ -358,4 +360,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -414,5 +417,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1354,5 +1357,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1417,4 +1420,51 @@
 msgid "Preferences"
 msgstr "التفضيلات"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Purge..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "هامبرغر"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+msgid "Confirm Purging"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "أضف إلى اخيار"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1456,4 +1506,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1687,4 +1738,5 @@
 msgstr ""
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1692,4 +1744,5 @@
 #: ../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 ""
@@ -2884,4 +2937,5 @@
 
 #. 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
@@ -2911,5 +2965,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "مُوافق"
@@ -3119,5 +3173,5 @@
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 
@@ -3149,10 +3203,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3162,4 +3211,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3538,5 +3593,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3546,6 +3601,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3555,10 +3610,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3566,5 +3623,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3573,5 +3630,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3579,4 +3636,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3885,5 +3950,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -4155,69 +4220,69 @@
 msgstr "كلمة‌المرور"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "الإستعمال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "الخيارات"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "أعرض هذه المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4227,9 +4292,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "أمثال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4237,45 +4302,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "جاري التهيئة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4284,14 +4349,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "الملفّ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4310,10 +4391,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "العرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4321,5 +4402,5 @@
 msgstr "العدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4327,5 +4408,5 @@
 msgstr "التعيينات المسبقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4336,5 +4417,5 @@
 msgstr "اللائحة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "سمعيّ"
@@ -4436,12 +4517,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "صيني"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "تجاري"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5149,5 +5228,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "الكلّ"
@@ -5787,5 +5866,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "العلاقات"
@@ -5879,10 +5958,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6481,4 +6560,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6940,5 +7021,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6982,111 +7062,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "الإسم"
@@ -8118,21 +8199,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "خ. العرض الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "خ. الطول الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "خ. العرض الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "خ. الطول الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8140,10 +8225,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "العلبة المحاطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8152,15 +8237,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8305,8 +8390,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "النوع"
@@ -8335,6 +8420,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "مجهول"
@@ -8717,7 +8802,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "ادخل تعليقك"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -8908,7 +8992,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9217,12 +9303,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "مراجعة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "تابع"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9248,7 +9332,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "لا تظهر مرة اخرى"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9431,5 +9514,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9610,5 +9693,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr ""
@@ -11237,5 +11320,5 @@
 msgstr "الألوان"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11246,35 +11329,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "أرسم نقاط عريضة لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "السرعة ( أحمر = بطيء، أخضر= سريع)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "ضوبان الموقع (أحمر=عالي،أخضر=منخفض، عندما تكون متوفرة)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11282,5 +11365,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11302,5 +11385,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11342,5 +11425,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11354,63 +11437,70 @@
 msgstr "المشي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "أرسم أسهم الإتجاه"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "رسم سريع ( أقل جودة)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "فقط على رأس الطريق."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "المؤلف"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11418,9 +11508,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11428,29 +11518,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "الطول الأقصى (أمتار)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11458,5 +11548,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11464,13 +11554,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "المسافة الأدنى (نقاط)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "أرسم نقاط أكبر لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11478,9 +11568,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11488,54 +11578,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "تلوين الأثر و النقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "نقاط جهاز تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "المعطيات أو.أس.أم"
@@ -12747,5 +12837,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14306,5 +14396,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14331,5 +14421,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14570,5 +14660,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -15017,5 +15107,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "مباني"
@@ -15252,5 +15342,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17814,13 +17904,13 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "حرّر أحذية"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "الفاصل"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18896,5 +18986,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -20845,5 +20935,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr ""
@@ -21382,5 +21472,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21393,5 +21483,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "غابة/حرش"
@@ -21669,4 +21759,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21695,9 +21847,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr ""
@@ -21807,9 +21990,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr ""
@@ -22233,5 +22447,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22266,5 +22480,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22278,5 +22492,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22405,4 +22627,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22434,14 +22664,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -22703,12 +22937,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -23560,5 +23794,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "التوتر"
@@ -23870,6 +24104,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -23921,32 +24157,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
@@ -23955,4 +24191,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24005,174 +24242,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24202,7 +24439,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "الرقم المرجعي"
@@ -24218,5 +24455,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "تحت الأرض"
@@ -24229,6 +24466,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
@@ -24404,5 +24641,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -24439,6 +24676,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "ملجأ"
@@ -24446,5 +24683,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr ""
@@ -24563,5 +24800,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -24621,11 +24858,241 @@
 msgstr "حرّر فندق"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "النجوم"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr ""
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "رقم الهاتف"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "فندق (رخيص)"
@@ -24633,20 +25100,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "حرّر فندق (رخيص)"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "بيت ضيافة"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "حرّر بيت ضيافة"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "كوخ"
@@ -24654,10 +25121,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "حرّر كوخ"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "نزل"
@@ -24665,30 +25132,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "حرّر نزل"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "كوخ جبلي"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "حرّر كوخ جبلي"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "موقع قافلة"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "حرّر موقع قافلة"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "موقع تخييم"
@@ -24696,10 +25163,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "حرّر موقع تخييم"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "طعام و شراب"
@@ -24710,5 +25177,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "مطعم"
@@ -24716,11 +25183,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "حرّر مطعم"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -24728,78 +25195,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "إيطالي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "صيني"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "هامبرغر"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "يوناني"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "ألماني"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "هندي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "محلي/إقليمي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "كباب / شورما"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "تركي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "آسيوي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "تايلاندي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "مكسيكي"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "ياباني"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -24807,17 +25275,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -24825,9 +25305,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "حانة"
@@ -24835,19 +25316,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "حانة"
@@ -24855,9 +25337,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "نادي سهر / نادي ليلي"
@@ -24865,24 +25348,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "حرّر نادي سهر/ نادي ليلي"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "سياحة"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "متحف"
@@ -24890,9 +25374,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -24901,9 +25385,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -24911,24 +25395,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "أعمال فنية"
@@ -24936,5 +25420,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "حرّر أعمال فنية"
@@ -24942,19 +25426,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "الخريطة"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -24992,5 +25476,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24998,28 +25482,28 @@
 msgstr "شارع"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25029,5 +25513,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25035,5 +25519,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr ""
@@ -25041,6 +25525,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "ركب الدراجة"
@@ -25048,5 +25532,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25054,6 +25538,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "تزلّج"
@@ -25061,5 +25545,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25067,46 +25551,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "التاريخ"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "الطبيعة"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25115,5 +25599,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25121,29 +25605,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "حرّر ملجأ"
@@ -25151,25 +25635,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "موقع تنزه"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "حرّر موقع تنزه"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "قلعة"
@@ -25178,19 +25662,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -25199,9 +25683,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "ساحة معركة"
@@ -25209,10 +25693,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "حرّر ساحة معركة"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25220,5 +25704,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25226,15 +25710,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "ضريح"
@@ -25242,55 +25726,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "حرّر ضريح"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "ملعب"
@@ -25298,35 +25782,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -25340,6 +25824,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -25755,6 +26239,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -25789,240 +26273,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "متعدد"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "أسلحة الرماية"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "كرة المضرب"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "كرة السلّة"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "التسلق"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "ركوب الدراجة"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "سبق الكلاب"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "ركوب الخيل"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "الجمباز"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "سبق الخيل"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "رياضة المحركات"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "التزلج"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "كرة القدم"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "السباحة"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "تنس الطاولة"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "التنس"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "متعدد"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26064,23 +26548,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "النوع"
@@ -26122,211 +26606,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "رياضة المحركات"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "حرّر رياضة المحركات"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
@@ -26334,52 +26818,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "خبير"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "رماية"
@@ -26387,204 +26871,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "تنس"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "مبنى"
@@ -26592,5 +27076,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -26598,10 +27082,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -26609,10 +27093,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "سفارة"
@@ -26620,10 +27104,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "محكمة"
@@ -26632,10 +27116,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "سجن"
@@ -26644,10 +27128,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "شرطة"
@@ -26657,10 +27141,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -26669,10 +27153,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -26680,5 +27164,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -26686,15 +27170,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "مدرسة"
@@ -26702,10 +27186,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "جامعة"
@@ -26713,10 +27197,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "كلّية"
@@ -26724,5 +27208,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -26730,5 +27214,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "سينما"
@@ -26737,10 +27221,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "مكتبة"
@@ -26749,9 +27233,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -26759,10 +27243,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "مسرح"
@@ -26771,10 +27255,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "معبد"
@@ -26784,5 +27268,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -26791,6 +27275,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "الديانة"
@@ -26799,66 +27283,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -26867,81 +27351,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "عناوين"
@@ -26950,5 +27434,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -26956,5 +27440,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "رقم المنزل"
@@ -26962,25 +27446,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "إسم الشارع"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "رمز البلد"
@@ -26989,5 +27473,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -26995,61 +27479,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "المصانع"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "برج"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27057,25 +27541,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "منارة"
@@ -27083,10 +27567,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -27094,10 +27578,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -27106,41 +27590,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "غاز"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -27150,10 +27634,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "ونش"
@@ -27161,5 +27645,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "حرّر ونش"
@@ -27167,10 +27651,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -27178,10 +27662,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -27189,23 +27673,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -27215,35 +27699,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -27252,10 +27736,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -27264,5 +27748,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -27270,10 +27754,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -27284,23 +27768,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -27309,20 +27793,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27330,55 +27814,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "مراحيض"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "هاتف"
@@ -27387,5 +27871,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -27393,5 +27877,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -27399,5 +27883,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "الملاحظات"
@@ -27405,5 +27889,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27411,5 +27895,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr ""
@@ -27417,15 +27901,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -27434,5 +27918,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -27440,35 +27924,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27476,5 +27960,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27483,31 +27967,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -27586,5 +28070,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27594,31 +28078,31 @@
 msgstr "خضار"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27627,30 +28111,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "مخبئ"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "نافورة"
@@ -27659,10 +28143,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -27671,10 +28155,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27683,5 +28167,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27689,5 +28173,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -27695,15 +28179,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27711,10 +28195,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "حرّر متجر سيارات"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27723,28 +28207,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr ""
@@ -27752,9 +28236,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "كشك"
@@ -27762,27 +28246,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "جزار"
@@ -27790,9 +28274,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "خباز"
@@ -27800,9 +28284,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -27810,18 +28294,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr ""
@@ -27829,54 +28313,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr ""
@@ -27884,9 +28368,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -27894,9 +28378,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27904,54 +28388,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -27959,9 +28443,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -27969,9 +28453,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -27979,24 +28463,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -28004,5 +28488,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr ""
@@ -28010,97 +28494,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "مصرف"
@@ -28108,14 +28592,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -28123,5 +28607,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -28129,15 +28613,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "أطباء"
@@ -28145,18 +28629,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -28164,5 +28648,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -28170,9 +28654,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "مستشفى"
@@ -28180,10 +28664,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -28192,5 +28676,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -28199,20 +28683,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "إسم النقطة"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "رقم الهاتف"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -28220,5 +28699,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "بيطري"
@@ -28227,64 +28706,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "الأماكن"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "قارة"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "وطن"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr ""
@@ -28292,15 +28771,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "مدينة"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "بلدة"
@@ -28308,10 +28787,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "ضاحية"
@@ -28319,25 +28798,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "قرية"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -28345,5 +28824,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "محلة"
@@ -28351,10 +28830,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "جزيرة"
@@ -28362,10 +28841,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28373,5 +28852,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28379,5 +28858,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -28385,10 +28864,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "قمّة"
@@ -28396,10 +28875,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "جليد"
@@ -28407,10 +28886,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "بركان"
@@ -28418,70 +28897,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "دولية"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "مدنية"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "شجرة"
@@ -28490,15 +28969,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "حرج"
@@ -28507,5 +28986,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -28513,17 +28992,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "غابة"
@@ -28532,14 +29011,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -28547,25 +29026,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "حصاة"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -28573,10 +29052,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr ""
@@ -28584,5 +29063,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
@@ -28590,5 +29069,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -28597,45 +29076,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "مرج"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -28643,25 +29122,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "حديقة"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "عشب"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -28669,10 +29148,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "شائع"
@@ -28680,20 +29159,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "متنزه"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -28701,5 +29180,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -28707,15 +29186,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -28723,9 +29202,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -28733,39 +29212,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -28773,15 +29252,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "عسكري"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -28789,50 +29268,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
@@ -28842,5 +29321,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -28852,5 +29331,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "الفلق الخارجي"
@@ -28858,5 +29337,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -28864,5 +29343,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -28873,5 +29352,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -28879,36 +29358,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -28916,5 +29395,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -28923,5 +29402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -28929,34 +29408,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -28965,15 +29444,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "إلى الطريق"
@@ -28981,5 +29460,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "الطريق"
@@ -28988,5 +29467,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -28994,5 +29473,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -29100,5 +29579,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29109,17 +29588,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29187,5 +29666,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29195,9 +29674,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29211,10 +29690,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -29222,31 +29701,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -29255,30 +29734,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -30456,16 +30935,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr ""
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33384,7 +33851,4 @@
 msgstr ""
 
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "درجات دقائق ثواني"
-
 #~ msgid "Unknown version"
 #~ msgstr "نسخة مجهولة"
@@ -33578,4 +34042,7 @@
 #~ msgid "Set the language."
 #~ msgstr "عيّن اللغة"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "درجات دقائق ثواني"
 
 #~ msgid "EPSG:4326"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 22626)
+++ applications/editors/josm/i18n/po/bg.po	(revision 22628)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 13:01+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-07 00:00+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -228,4 +228,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -237,4 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -299,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Отмяна"
@@ -365,4 +367,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -421,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1373,5 +1376,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1436,4 +1439,53 @@
 msgid "Preferences"
 msgstr "Настройки"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Топограф..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "бургери"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Потвърждение"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "добави към селекцията"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1475,4 +1527,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1712,4 +1765,5 @@
 msgstr "Моля изберете поне един път за опростяване."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1717,4 +1771,5 @@
 #: ../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 "Да"
@@ -1763,8 +1818,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Текушата селекция не може да се използва за разделяне."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2952,4 +3006,5 @@
 
 #. 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
@@ -2979,5 +3034,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "ОК"
@@ -3193,8 +3248,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Вие се каните да изтриете възли, намиращи се извън зоната, която сте свалили "
+"от сървъра.<br>Това може да предизвика проблеми, защото други обекти (които "
+"не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3225,10 +3284,5 @@
 msgstr[1] "Преместване {0} възела"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Обектът ''{0}'' е изтрит"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3238,4 +3292,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Обектът ''{0}'' е изтрит"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3628,5 +3688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3636,6 +3696,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3645,10 +3705,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3656,5 +3718,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3663,5 +3725,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3669,4 +3731,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3965,5 +4035,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "железопътна линия"
@@ -4237,69 +4307,69 @@
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "използване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Показване на тази помощ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Стандартен параметри на unix геометрия"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Сваляне на област в предала на рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Сваляне на област от рамка, като GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Избор с даденото търсене"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Стартиране в максимизиран режим"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Възстановяване на параметрите по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/път/към/папката/на/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4309,9 +4379,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "примери"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4319,45 +4389,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Инициализиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Зареждане на ранните разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Настройки по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Създаване на интерфейса"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Зареждане на разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4366,14 +4436,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Настройката {0} беше премахната тъй като вече не се използва."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Файл"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4392,10 +4478,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Преглед"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4403,5 +4489,5 @@
 msgstr "Инструменти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4409,5 +4495,5 @@
 msgstr "Шаблони"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4418,5 +4504,5 @@
 msgstr "Меню: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Аудио"
@@ -4514,17 +4600,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Помощна улица"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "китайска"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Търговия"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5236,5 +5319,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "всички"
@@ -5870,5 +5953,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Връзки"
@@ -5962,10 +6045,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6566,4 +6649,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7025,5 +7110,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7067,111 +7151,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Име"
@@ -8205,21 +8290,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "мин. ширина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "мин. дължина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "макс. ширина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "макс. дължина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8229,10 +8318,10 @@
 "за сваляне)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8241,15 +8330,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8396,8 +8485,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Тип"
@@ -8426,6 +8515,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "неизвестно"
@@ -8821,7 +8910,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Невалиден коментар на заявката за качване"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9014,7 +9102,9 @@
 msgstr ""
 
+#. 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 "Не"
@@ -9320,17 +9410,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Невалиден коментар на заявката за качване"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Нулиране"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Продължи"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9356,7 +9443,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Да не се показва повече"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9550,5 +9636,5 @@
 msgstr[1] "Качване на {0} обекта..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9729,5 +9815,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Описание"
@@ -11387,5 +11473,5 @@
 msgstr "Цветове"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11396,36 +11482,36 @@
 msgstr "Всички"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Само локални файлове"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Никога"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Изобразвай линии, даже и ако не са импортирани сегменти."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Изобразявай големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорост (червено = бавно, зелено = бързо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Неточност на позицията (червено = висока, зелено = ниска, ако е приложимо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Единствен цвят (може да се настройва за наименувани слоеве)"
@@ -11433,5 +11519,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11453,5 +11539,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11493,5 +11579,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11505,16 +11591,16 @@
 msgstr "Пеш"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Изобразвай направлението със стрелки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Бързо изрисуване (изглежда по-зле)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11522,49 +11608,54 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Само в началото на път."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Показвай поредния номер на сегментите"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Изобразвай границите на свалените данни."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Изобразявай виртуални възли в режим на избор."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Изобразявай неактивните слоеве в друг цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Изглаждане на линиите (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Автор"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Дизел"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Лодка"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11574,9 +11665,9 @@
 "отваряне на GPX слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Свързване с линии на GPS точките"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11586,9 +11677,9 @@
 "Задайте ''-1'' за чертаене на всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Максимална дължина за локални файлове (метри)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11597,20 +11688,20 @@
 "се рисуват всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Максимална дължина (в метри)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Изобразвай линии, даже ако не е импортирана информация за линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Изобразвай стрелки по посоката на линиите, съединяващи GPS точки."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11619,5 +11710,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11626,13 +11717,13 @@
 "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Минимално разстояние (в пиксели)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Рисуване на по-големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11642,9 +11733,9 @@
 "в мениджър слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Оцветяване точките от следите според скоростта."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11652,5 +11743,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -11658,42 +11749,41 @@
 "скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Оцветяване на следата"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "WayPoint изображение"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Показване на направлението на сегментите на пътя."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показване поредните номера на всички сегменти на пътя."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Приложи изглаждане върху картата."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Изобразяване границата на свалената от сървъра област."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11702,9 +11792,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Изобразяване неактивните слоеве с данни в други цветове."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM Данни"
@@ -12074,7 +12164,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Слой за провеждане на измервания"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12916,5 +13005,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14489,5 +14578,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14514,5 +14603,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14760,5 +14849,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -15207,5 +15296,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Сгради"
@@ -15442,5 +15531,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17438,7 +17527,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "оправена версия:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18068,13 +18156,13 @@
 msgstr "Разделяне на сграда"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Редактирай магазин за обувки"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Разделител"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19155,5 +19243,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -21164,5 +21252,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Означение"
@@ -21701,5 +21789,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "метал"
@@ -21712,5 +21800,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr ""
@@ -21988,4 +22076,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22014,9 +22164,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "да"
@@ -22126,9 +22307,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "не"
@@ -22552,5 +22764,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "туристически маршрут"
@@ -22585,5 +22797,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "за средно ниво"
@@ -22597,5 +22809,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22724,4 +22944,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22753,14 +22981,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Оператор"
@@ -23022,12 +23254,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -23879,5 +24111,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Волтаж"
@@ -24189,6 +24421,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24240,32 +24474,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Работно време"
@@ -24274,4 +24508,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24324,174 +24559,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "денонощно"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "понеделник-петък 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Дизел"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Био дизел"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "Бензин А91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "Бензин А95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "Бензин А98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "Бензин А100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24521,7 +24757,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Ref номер"
@@ -24537,5 +24773,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "подземен"
@@ -24548,6 +24784,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Такса"
@@ -24723,5 +24959,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -24758,6 +24994,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Навес"
@@ -24765,5 +25001,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Скамейка"
@@ -24882,5 +25118,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -24940,11 +25176,241 @@
 msgstr "Редактирай хотел"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Звезди"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "терминал"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Телефонен номер"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Мотел"
@@ -24952,20 +25418,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Редактирай мотел"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Къща за гости"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Редактирай къща за гости"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Бунгало"
@@ -24973,10 +25439,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Редактирай бунгало"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Хостел / студентско общежитие"
@@ -24984,30 +25450,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Редактирай хостел / студентско общежитие"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Планинска хижа"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Редактирай планинска хижа"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Площадка за каравани"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Редактирай площадка за каравани"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Къмпинг"
@@ -25015,10 +25481,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Редактирай къмпинг"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Храна и напитки"
@@ -25029,5 +25495,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторант"
@@ -25035,11 +25501,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Редактирай ресторант"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Кухня"
@@ -25047,78 +25513,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "италианска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "китайска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "пица"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "бургери"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "гръцка"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "немска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "индийска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "местна"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "турска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "азиатска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "тайландска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "мексиканска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "японска"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Заведение за бързо хранене"
@@ -25126,17 +25593,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Редактирай заведение бързо хранене"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Кафене"
@@ -25144,9 +25623,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Редактирай кафене"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Бар"
@@ -25154,19 +25634,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Редактирай бар"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Бирария"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Редактирай бирария"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Бар"
@@ -25174,9 +25655,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Редактиране на бар"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Нощен клуб"
@@ -25184,24 +25666,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Редактирай нощен клуб"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Туризъм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Атракция"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Редактирай забележилтеност"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Музей"
@@ -25209,9 +25692,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Редактирай музей"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -25220,9 +25703,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Редактирай зоопарк"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Място с добра гледка"
@@ -25230,24 +25713,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Редактирай място с добра гледка"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Наблюдателница"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Развлекателен парк"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Редактирай развлекателен парк"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Творба на изкуството"
@@ -25255,5 +25738,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Редактирай творба на изкуството"
@@ -25261,19 +25744,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Информационен пункт"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25311,5 +25794,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25317,28 +25800,28 @@
 msgstr "улица"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "схема"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "място"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "град"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "район"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "По-подробно описание"
@@ -25348,5 +25831,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Показани са пътища за:"
@@ -25354,5 +25837,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Туристическа пътека"
@@ -25360,6 +25843,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Велосипедизъм"
@@ -25367,5 +25850,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Планинско колоездене"
@@ -25373,6 +25856,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Ски"
@@ -25380,5 +25863,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Колоездене"
@@ -25386,46 +25869,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... възможни са други способи за придвижване"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Информационно табло"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Съдържание на таблото"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "табела"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "дива природа"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Упътване"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25434,5 +25917,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Информационен пункт"
@@ -25440,29 +25923,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "По-точно описание"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Аудио напътствия"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Аудио-напътствия по мобилен телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Тел. номер"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Други информационни точки"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Редактирай навес"
@@ -25470,25 +25953,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Огнище"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Място за пикник"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Редактирай място за излет"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Исторически места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Замък"
@@ -25497,19 +25980,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Редактирай замък"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Руини"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Редактирай руини"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Архиологични разкопки"
@@ -25518,9 +26001,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Редактирай архиологични разкопки"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Поле на битка"
@@ -25528,10 +26011,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Редактирай поле на битка"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25539,5 +26022,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25545,15 +26028,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Паметник"
@@ -25561,55 +26044,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Пограничен камък"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "редактиране на: Пограничен камък"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Площадка"
@@ -25617,35 +26100,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -25659,6 +26142,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -26074,6 +26557,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26108,240 +26591,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "многобой"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "стрелба с лък"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "австралийски футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "игра с мет.топчета"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "игра с асим.топки"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "кану"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "алпинизъм"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "крикет мрежи"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "кучешки надбягвания"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "конна езда"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "голф"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "конни надбягвания"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "моторен спорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "ракет бол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "стрелба"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "фигурно пързаляне"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "ски"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "плуване"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "тенис на маса"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "тенис"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Многобой"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Редактирай многобой"
@@ -26383,23 +26866,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "тип"
@@ -26441,211 +26924,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "игрище"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "спортен център"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "следа"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Моторни спортове"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Редактирай моторни спортове"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
@@ -26653,52 +27136,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "за напреднали"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Стрелба"
@@ -26706,204 +27189,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Голф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "ракет"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Изкуствени"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Сграда"
@@ -26911,5 +27394,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -26917,10 +27400,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Кметство"
@@ -26928,10 +27411,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Посолство"
@@ -26939,10 +27422,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -26951,10 +27434,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Затвор"
@@ -26963,10 +27446,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -26976,10 +27459,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -26988,10 +27471,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -26999,5 +27482,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -27005,15 +27488,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Училище"
@@ -27021,10 +27504,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Университет"
@@ -27032,10 +27515,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Колеж"
@@ -27043,5 +27526,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -27049,5 +27532,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Кино"
@@ -27056,10 +27539,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Библиотека"
@@ -27068,9 +27551,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -27078,10 +27561,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Театър"
@@ -27090,10 +27573,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -27103,5 +27586,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -27110,6 +27593,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Религия"
@@ -27118,66 +27601,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Конфесия"
@@ -27186,81 +27669,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Адреси"
@@ -27269,5 +27752,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -27275,5 +27758,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Номер"
@@ -27281,25 +27764,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Име на улица"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Код на държава"
@@ -27308,5 +27791,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -27314,61 +27797,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "по азбучен ред"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Цех"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Кула"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Тип на кулата"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Височина (в метри)"
@@ -27376,25 +27859,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -27402,10 +27885,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Мелница"
@@ -27413,10 +27896,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -27425,41 +27908,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "нефт"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "отходна тръба"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Местоположение"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "подводно"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -27469,10 +27952,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Кран"
@@ -27480,5 +27963,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Редактирай кран"
@@ -27486,10 +27969,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -27497,10 +27980,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -27508,23 +27991,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -27534,35 +28017,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Електростанция"
@@ -27571,10 +28054,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -27583,5 +28066,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -27589,10 +28072,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -27603,23 +28086,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "кула"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -27628,20 +28111,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Тип на линия"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27649,55 +28132,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Брой проводници"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Брой на жилата на всеки кабел"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "един"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "два"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "три"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "четири"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Тоалетни"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Телефон"
@@ -27706,5 +28189,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -27712,5 +28195,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Монети"
@@ -27718,5 +28201,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Банкноти"
@@ -27724,5 +28207,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -27730,5 +28213,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -27736,15 +28219,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -27753,5 +28236,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -27759,35 +28242,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27795,5 +28278,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27802,31 +28285,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "камък"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "пластмаса"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Цвят"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "черно"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "кафяво"
@@ -27905,5 +28388,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27913,31 +28396,31 @@
 msgstr "зеленина"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "червено"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "синьо"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "сиво"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "бяло"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Брой седящи места"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
@@ -27946,30 +28429,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Скривалище"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Заключване"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Фонтан"
@@ -27978,10 +28461,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -27990,10 +28473,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Пожарен кран"
@@ -28002,5 +28485,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "редактиране на \"Пожарен кран\""
@@ -28008,5 +28491,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -28014,15 +28497,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Автомобили"
@@ -28030,10 +28513,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Редактирай автосалон"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Велосипеди"
@@ -28042,28 +28525,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Редактирай вело-магазин"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Редактиране на: аптека"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Хранителни стоки"
@@ -28071,9 +28554,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Редактиране на \"магазин за хранителни стоки\""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Будка"
@@ -28081,27 +28564,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Книжарница"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Редактиране на книжарница"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Туристическа агенция"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Редактиране на туристическа агенция"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Месарница"
@@ -28109,9 +28592,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Редактирай месарница"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Фурна"
@@ -28119,9 +28602,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Редактирай фурна"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -28129,18 +28612,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Редактирай цветарски магазин"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Био магазин"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Редактирай био магазин"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Алкохол"
@@ -28148,54 +28631,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Редактиране магазин за алкохол"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Редактиране магазин за безалкохолни"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Компютри"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -28203,9 +28686,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Редактирай градински център"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Железария"
@@ -28213,9 +28696,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Редактирай железария"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -28223,54 +28706,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Редактирай магазин \"Направи си сам\""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Книжарница"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Играчки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -28278,9 +28761,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Редактирай химическо чистене"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Пералня"
@@ -28288,9 +28771,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Редактирай пералня"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -28298,24 +28781,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Редактирай мазизин за туристически стоки"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -28323,5 +28806,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -28329,97 +28812,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Банка"
@@ -28427,14 +28910,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Редактирай банка"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -28442,5 +28925,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -28448,15 +28931,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Лекар"
@@ -28464,18 +28947,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "редактиране на \"Лекар\""
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -28483,5 +28966,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -28489,9 +28972,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Болница"
@@ -28499,10 +28982,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -28511,5 +28994,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -28518,20 +29001,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Име на пункта"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Телефонен номер"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -28539,5 +29017,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -28546,64 +29024,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Държава"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Област/Щат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Област"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Графство"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -28611,15 +29089,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -28627,10 +29105,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -28638,25 +29116,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -28664,5 +29142,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Местност"
@@ -28670,10 +29148,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Остров"
@@ -28681,10 +29159,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Редактирай остров"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Скала"
@@ -28692,5 +29170,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Редактиране на: скала"
@@ -28698,5 +29176,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -28704,10 +29182,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Връх"
@@ -28715,10 +29193,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Ледник"
@@ -28726,10 +29204,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Вулкан"
@@ -28737,70 +29215,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Национална"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Административна"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Политическа"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Национален парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Дърво"
@@ -28809,15 +29287,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Гора"
@@ -28826,5 +29304,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "редактиране на \"гора\""
@@ -28832,17 +29310,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Гора"
@@ -28851,14 +29329,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "редактиране на \"залесена площ\""
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -28866,25 +29344,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Сипей"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Скалист склон"
@@ -28892,10 +29370,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Пустош"
@@ -28903,5 +29381,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Редактиране пустош"
@@ -28909,5 +29387,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -28916,45 +29394,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Земя за лично ползване"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Редактиране на: Земя за лично ползване"
@@ -28962,25 +29440,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Градина"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Трева"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Зелено село"
@@ -28988,10 +29466,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Общи"
@@ -28999,20 +29477,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -29020,5 +29498,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -29026,15 +29504,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -29042,9 +29520,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Гробище"
@@ -29052,39 +29530,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -29092,15 +29570,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Военен"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -29108,50 +29586,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
@@ -29161,5 +29639,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -29171,5 +29649,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "външен сегмент"
@@ -29177,5 +29655,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -29183,5 +29661,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29192,5 +29670,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29198,36 +29676,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29235,5 +29713,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -29242,5 +29720,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -29248,34 +29726,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "само направо"
@@ -29284,15 +29762,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "до път"
@@ -29300,5 +29778,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Маршрут"
@@ -29307,5 +29785,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -29313,5 +29791,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -29419,5 +29897,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29428,17 +29906,17 @@
 msgstr "велосипед"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ски"
@@ -29506,5 +29984,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29514,9 +29992,9 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "обиколка"
@@ -29530,10 +30008,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -29541,31 +30019,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Състояние на пътя"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -29574,30 +30052,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -30775,16 +31253,4 @@
 msgstr "въздушен транспорт"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "терминал"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33703,12 +34169,4 @@
 msgstr "Сицилия - Италия"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Избраният път не съдържа избраната точка."
-#~ msgstr[1] "Избраният път не съдържа избраните точки"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Градуси, минути, секунди"
-
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -33953,4 +34411,7 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Конфликтиращи релации"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Градуси, минути, секунди"
 
 #~ msgid "JOSM Online Help"
@@ -34402,14 +34863,4 @@
 #~ "започнете нов слой в новата зона."
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Вие се каните да изтриете възли, намиращи се извън зоната, която сте "
-#~ "свалили от сървъра.<br>Това може да предизвика проблеми, защото други "
-#~ "обекти (които не виждате) може да ги използват.<br>Наистина ли искате да "
-#~ "ги триете?"
-
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "Разрешаване {0} конфликти в {1} обекти"
@@ -34491,4 +34942,9 @@
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Грешка при зареждане на страница {0}"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Избраният път не съдържа избраната точка."
+#~ msgstr[1] "Избраният път не съдържа избраните точки"
 
 #~ msgid "Selected makes your trace public in openstreetmap.org"
@@ -34607,7 +35063,4 @@
 #~ msgid "Merge Anyway"
 #~ msgstr "Сливане въпреки всичко"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Продължи"
 
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
@@ -34951,7 +35404,4 @@
 #~ msgstr ">"
 
-#~ msgid "Confirmation"
-#~ msgstr "Потвърждение"
-
 #~ msgid "Delete all"
 #~ msgstr "Изтриване на всички"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 22626)
+++ applications/editors/josm/i18n/po/cs.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 13:42+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-07 01:21+0000\n"
 "Last-Translator: hanoj <ehanoj@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -229,4 +229,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -238,4 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -245,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -300,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Zrušit"
@@ -366,4 +368,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -422,5 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1375,5 +1378,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1440,4 +1443,53 @@
 msgid "Preferences"
 msgstr "Předvolby"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Připravuji..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Potvrzení"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "přidat k výběru"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1479,4 +1531,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1716,4 +1769,5 @@
 msgstr "Vyberte alespoň jednu cestu k zjednodušení."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1721,4 +1775,5 @@
 #: ../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 "Ano"
@@ -1770,8 +1825,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Tento výběr nemůže být použit k rozdělení."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2973,4 +3027,5 @@
 
 #. 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
@@ -3000,5 +3055,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3216,8 +3271,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
+"problémy, protože jiné objekty (které nevidíte) je mohou používat."
+"<br>Opravdu je chcete smazat?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3249,10 +3308,5 @@
 msgstr[2] "Přesunout uzly {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Odstraněný objekt ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3263,4 +3317,10 @@
 msgstr[2] "Odstraněno {0} objektů"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Odstraněný objekt ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3650,5 +3710,5 @@
 msgstr "Prvek {0} nelze přidat do datové sady, jelikož v ní již je"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3658,6 +3718,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3667,10 +3727,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3678,5 +3740,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3685,5 +3747,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3691,4 +3753,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3988,5 +4058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "železnice"
@@ -4262,69 +4332,69 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Spustit přes celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Nastavit jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/ADRESARI/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Změnit adresář pro všechna uživatelská nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4334,9 +4404,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4346,45 +4416,45 @@
 "pořadí."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Inicializace"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Aktualizuji pluginy..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Instaluji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Vytváří se grafické rozhraní programu (GUI)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4393,14 +4463,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Soubor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4419,10 +4505,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4430,5 +4516,5 @@
 msgstr "Nástroje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4436,5 +4522,5 @@
 msgstr "Předvolby"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4445,5 +4531,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Zvuk"
@@ -4541,17 +4627,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Účelová komunikace"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "čínská"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Kanceláře"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5291,5 +5374,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "všechny"
@@ -5939,5 +6022,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relace"
@@ -6031,10 +6114,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Vybrat relaci v seznamu relací."
@@ -6640,4 +6723,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7099,5 +7184,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7141,111 +7225,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Název"
@@ -8309,21 +8394,25 @@
 msgstr "Přejmenovat vybranou záložku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min šíř."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min dél."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max šíř."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max dél."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8331,10 +8420,10 @@
 msgstr "URL z www.openstreetmap.org (adresu můžete vložit do pole níže)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8343,15 +8432,15 @@
 msgstr "Řetězec ''{0}'' není platná hodnota pro reálné číslo (double)."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Hodnota zeměpisné šířky musí být v rozmezí [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Hodnota zeměpisné délky musí být v rozmezí [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8498,8 +8587,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Typ"
@@ -8528,6 +8617,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "neznámý"
@@ -8941,7 +9030,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Neplatný komentář k nahrávání"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9134,7 +9222,9 @@
 msgstr "Vyberte soubor"
 
+#. 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 "Ne"
@@ -9445,17 +9535,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Neplatný komentář k nahrávání"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Obrátit"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Pokračovat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9473,7 +9560,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Přejít na předchozí stránku"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9482,7 +9568,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Toto již víckrát neukazovat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9695,5 +9780,5 @@
 msgstr[2] "Nahrávám {0} objektů..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9880,5 +9965,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Popis"
@@ -11548,5 +11633,5 @@
 msgstr "Barvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11557,36 +11642,36 @@
 msgstr "Všechny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Místní soubory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Žádný"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Vynutit kreslení spojnic mezi GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Kreslit větší GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rychlost (červená = pomalá, zelená = rychlá)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Nepřesnost pozice (červená = vysoká, zelená = nízká, je-li k dispozici)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna barva (může být nastavena pro pojmenované vrstvy)"
@@ -11594,5 +11679,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11614,5 +11699,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11654,5 +11739,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11666,65 +11751,70 @@
 msgstr "Pěší"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Kreslit šipky ve směru jízdy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Rychlé vykreslování (vypadá ošklivě)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Jen zajímavé směry (např. jednosměrka)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Pouze na prvním úseku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Vykreslit segmenty s pořadovými čísly"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykreslit ohraničující box stažených dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykreslovat virtuální uzly v modu výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Vykreslovat neaktivní vrstvy v jiných barvách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhlazené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Vytvořit značky při čtení GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Nafta"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Loď"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11732,9 +11822,9 @@
 msgstr "Automaticky vytvořit vrstvu se značkami při otevírání GPX vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Kreslit čáru mezi body GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11742,9 +11832,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Maximální délka lokálních souborů (v metrech)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11753,10 +11843,10 @@
 "kreslení všech linií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maximální délka (metrů)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11764,15 +11854,15 @@
 "Vynutit kreslení čar, pokud importovaná data neobsahují informace o čarách."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Zobrazovat šipky pro čary spojující GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11780,13 +11870,13 @@
 msgstr "Nekreslit šipky, pokud nejsou alespoň tuto vzdálenost od předchozí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minimální vzdálenost (pixelů)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovat větší tečky pro GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11796,9 +11886,9 @@
 "v kartě vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Obarvovat body a části trasy podle rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11806,54 +11896,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Umožní ladit barvy cesty pro rozdílné průměrné rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Barvy tras a bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Zobrazovat směr u segmentů cesty."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Zobrazovat pořadí u všech segmentů v cestách."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovat hranice dat stažených ze serveru."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovat neaktivní vrstvy dat jinou barvou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM data"
@@ -12231,7 +12321,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Vrstva pro prováděná měření"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13098,5 +13187,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14717,5 +14806,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14742,5 +14831,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14984,5 +15073,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -15431,5 +15520,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Budovy"
@@ -15674,5 +15763,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17667,7 +17756,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "finální verze:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18294,13 +18382,13 @@
 msgstr "Řada domů"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Upravit obchod s obuví"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Oddělovač"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19395,5 +19483,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21402,5 +21490,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Číslo"
@@ -21939,5 +22027,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "kov"
@@ -21950,5 +22038,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "Prales"
@@ -22226,4 +22314,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22252,9 +22402,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "ano"
@@ -22364,9 +22545,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "ne"
@@ -22790,5 +23002,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "turistická"
@@ -22823,5 +23035,5 @@
 msgstr "dobrá"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
@@ -22835,5 +23047,13 @@
 msgstr "příšerná"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Vozíky pro invalidy"
@@ -22962,4 +23182,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22991,14 +23219,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operátor"
@@ -23260,12 +23492,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -24117,5 +24349,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Napětí"
@@ -24427,6 +24659,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24478,32 +24712,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Otevírací doba"
@@ -24512,4 +24746,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24562,174 +24797,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pá 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Út-Ne 08:00-15:00; So 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr "S kioskem"
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Typy paliv:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Nafta"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Bionafta"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "91 oktanů"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "95 oktanů"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "98 oktanů"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "100 oktanů"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% směs etanolu)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% směs etanolu)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (propan-butan)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (zemní plyn)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 mix (motorka/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (motorka/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr "S kioskem"
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24759,7 +24995,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Číslo záchodu"
@@ -24775,5 +25011,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "podzemní"
@@ -24786,6 +25022,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Poplatek"
@@ -24961,5 +25197,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Invalidní vozík"
@@ -24996,6 +25232,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Přístřešek"
@@ -25003,5 +25239,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Lavička"
@@ -25120,5 +25356,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -25178,11 +25414,241 @@
 msgstr "Upravit hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Počet hvězdiček"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminál"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefonní číslo"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -25190,20 +25656,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Upravit motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Upravit penzion"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Horská chata"
@@ -25211,10 +25677,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Upravit horskou chatu"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Hostel"
@@ -25222,30 +25688,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Upravit hostel"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Horská bouda"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Upravit vysokohorskou boudu"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Autokemping (karavany)"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Upravit autokemping (karavany)"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -25253,10 +25719,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Upravit tábořiště"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -25267,5 +25733,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurace"
@@ -25273,11 +25739,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Upravit restauraci"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -25285,78 +25751,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -25364,17 +25831,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kavárna"
@@ -25382,9 +25861,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Hospoda"
@@ -25392,19 +25872,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -25412,9 +25893,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -25422,24 +25904,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Muzeum"
@@ -25447,9 +25930,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -25458,9 +25941,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -25468,24 +25951,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Upravit zábavní park"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -25493,5 +25976,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Upravit umělecké dílo"
@@ -25499,19 +25982,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Turistické informační centrum"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Přehledová mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Úroveň detailů"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topografická"
@@ -25549,5 +26032,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25555,28 +26038,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "orientační"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Zobrazený areál"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "místo"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "město"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -25586,5 +26069,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Trasy zobrazeny pro:"
@@ -25592,5 +26075,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "turistická stezka"
@@ -25598,6 +26081,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -25605,5 +26088,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Jízda na horském kole"
@@ -25611,6 +26094,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Lyžování"
@@ -25618,5 +26101,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Jízda na koni"
@@ -25624,54 +26107,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Obsah tabule"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "upozornění"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Rozcestník"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "stožár"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Informační terminál"
@@ -25679,29 +26161,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audioprůvodce"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Audioprůvodce přes mobilní telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Telefonní číslo"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -25709,25 +26191,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -25736,19 +26218,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -25757,9 +26239,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -25767,10 +26249,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Upravit bojiště"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Paleontologické naleziště"
@@ -25778,5 +26260,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Upravit paleontologické naleziště"
@@ -25784,15 +26266,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Památník"
@@ -25800,55 +26282,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Hraniční kameny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Upravit hraniční kameny"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Hřiště"
@@ -25856,35 +26338,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -25898,6 +26380,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -26313,6 +26795,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26347,240 +26829,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -26622,23 +27104,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "typ"
@@ -26680,211 +27162,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
@@ -26892,52 +27374,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Střelba"
@@ -26945,204 +27427,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Objekty a další POI"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Budova"
@@ -27150,5 +27632,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -27156,10 +27638,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Radnice"
@@ -27167,10 +27649,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -27178,10 +27660,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Soud"
@@ -27190,10 +27672,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Vězení"
@@ -27202,10 +27684,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Policie"
@@ -27215,10 +27697,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -27227,10 +27709,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Pošta"
@@ -27238,5 +27720,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -27244,15 +27726,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Základní škola"
@@ -27260,10 +27742,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Vysoká škola"
@@ -27271,10 +27753,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Střední škola"
@@ -27282,5 +27764,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -27288,5 +27770,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Kino"
@@ -27295,10 +27777,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Knihovna"
@@ -27307,9 +27789,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -27317,10 +27799,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Divadlo"
@@ -27329,10 +27811,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -27342,5 +27824,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -27349,6 +27831,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Náboženství"
@@ -27357,66 +27839,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Vyznání"
@@ -27425,81 +27907,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adresy"
@@ -27508,5 +27990,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -27514,5 +27996,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Číslo domu"
@@ -27520,25 +28002,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Ulice"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Kód země"
@@ -27547,5 +28029,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -27553,61 +28035,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Inženýrské objekty"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Továrna"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Věž"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Typ věže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "telekomunikační"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "pozorovací"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Výška (metrů)"
@@ -27615,25 +28097,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Maják"
@@ -27641,10 +28123,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -27652,10 +28134,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -27664,41 +28146,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "teplo"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "ropa"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "kanalizace"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Umístění"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "podvodní"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "nadzemní"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -27708,10 +28190,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Jeřáb"
@@ -27719,5 +28201,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
@@ -27725,10 +28207,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -27736,10 +28218,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -27747,23 +28229,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "vnitřní"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "venkovní"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -27773,35 +28255,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "sluneční"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -27810,10 +28292,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -27822,5 +28304,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -27828,10 +28310,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -27842,23 +28324,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "věž"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "stožár"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -27867,20 +28349,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Typ vedení"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27888,55 +28370,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Počet kabelů"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Počet drátů (nebo lépe vodičů) na každém kabelu"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "jednoduchý"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "dvojitý"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "trojitý"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "čtveřitý"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Záchody"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefon"
@@ -27945,5 +28427,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -27951,5 +28433,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Mince"
@@ -27957,5 +28439,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Bankovky"
@@ -27963,5 +28445,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -27969,5 +28451,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -27975,15 +28457,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -27992,5 +28474,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -27998,35 +28480,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Odpadkový koš"
@@ -28034,5 +28516,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Upravit odpadkový koš"
@@ -28041,31 +28523,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Opěrka zad"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "kámen"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Barva"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "černá"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "hnědá"
@@ -28144,5 +28626,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28152,31 +28634,31 @@
 msgstr "zeleň"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "bílá"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Počet sedadel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
@@ -28185,30 +28667,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Úkryt"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Uzamknutelný"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fontána"
@@ -28217,10 +28699,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -28229,10 +28711,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Požární hydrant"
@@ -28241,5 +28723,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Upravit požární hydrant"
@@ -28247,5 +28729,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -28253,15 +28735,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Prodejce automobilů"
@@ -28269,10 +28751,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Upravit obchod s auty"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Prodejce kol"
@@ -28281,28 +28763,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Upravit prodejnu kol"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Upravit drogerii"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -28310,9 +28792,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Upravit večerku"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -28320,27 +28802,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Knihkupectví"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Upravit knihkupectví"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Cestovní kancelář"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Upravit cestovní kancelář"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -28348,9 +28830,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Upravit řeznictví"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Pekařství"
@@ -28358,9 +28840,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Upravit pekařství"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Květinářství"
@@ -28368,18 +28850,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Upravit květinářství"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Obchod se zdravou výživou"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Upravit obchod se zdravou výživou"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -28387,54 +28869,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Upravit obchod s alkoholem"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Počítače"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Zahradnické centrum"
@@ -28442,9 +28924,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Upravit zahradnické centrum"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Železářství"
@@ -28452,9 +28934,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Upravit železářství"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Zboží pro kutily"
@@ -28462,54 +28944,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Upravit obchod se zbožím pro kutily"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Papírnictví"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Upravit papírnictví"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Videopůjčovna/prodejna"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Upravit videopůjčovnu/prodejnu"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -28517,9 +28999,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Upravit čistírnu"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Prádelna"
@@ -28527,9 +29009,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Upravit prádelnu"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Vybavení do přírody"
@@ -28537,24 +29019,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Obchod s vybavením do přírody"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Oční optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Upravit oční optiku"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -28562,5 +29044,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -28568,97 +29050,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Zůstatkové nebo věrnostní karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banka"
@@ -28666,14 +29148,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Upravit banku"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -28681,5 +29163,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -28687,15 +29169,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Zdavotní středisko, poliklinika"
@@ -28703,18 +29185,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Upravit zdravotní středisko, polikliniku"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -28722,5 +29204,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -28728,9 +29210,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Vydává léky na předpis"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -28738,10 +29220,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -28750,5 +29232,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -28757,20 +29239,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Jméno místa"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefonní číslo"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -28778,5 +29255,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -28785,64 +29262,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Místa"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Stát"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Upravit stát"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Země"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Kraj"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Okres"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -28850,15 +29327,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Město"
@@ -28866,10 +29343,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -28877,25 +29354,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Obec"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -28903,5 +29380,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Místní název"
@@ -28909,10 +29386,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Ostrov"
@@ -28920,10 +29397,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Upravit ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Ostrůvek"
@@ -28931,5 +29408,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Upravit ostrůvek"
@@ -28937,5 +29414,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -28943,10 +29420,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Vrchol"
@@ -28954,10 +29431,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Ledovec"
@@ -28965,10 +29442,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Sopka"
@@ -28976,70 +29453,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Národní"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Upravit civilní hranici"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Národní park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Strom"
@@ -29048,15 +29525,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Prales"
@@ -29065,5 +29542,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Editovat Prales"
@@ -29071,17 +29548,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Les"
@@ -29090,14 +29567,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -29105,25 +29582,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -29131,10 +29608,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -29142,5 +29619,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Upravit vřesoviště"
@@ -29148,5 +29625,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Farma"
@@ -29155,45 +29632,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Louka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -29201,25 +29678,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -29227,10 +29704,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -29238,20 +29715,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -29259,5 +29736,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -29265,15 +29742,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -29281,9 +29758,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -29291,39 +29768,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Obchody"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -29331,15 +29808,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -29347,50 +29824,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
@@ -29400,5 +29877,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -29410,5 +29887,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "vnější část"
@@ -29416,5 +29893,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -29422,5 +29899,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Hranice"
@@ -29431,5 +29908,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Upravit hranici"
@@ -29437,36 +29914,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Typ hranice"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "administrativní"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "národní"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "civilní"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "politická"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Administrativní centrum"
@@ -29474,5 +29951,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -29481,5 +29958,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -29487,34 +29964,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -29523,15 +30000,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "na cestu"
@@ -29539,5 +30016,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Trasa"
@@ -29546,5 +30023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -29552,5 +30029,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Typ trasy"
@@ -29658,5 +30135,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29667,17 +30144,17 @@
 msgstr "bicykl"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "lyžařská"
@@ -29745,5 +30222,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29753,9 +30230,9 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "objízdná"
@@ -29769,10 +30246,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -29780,31 +30257,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -29813,30 +30290,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -31014,16 +31491,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminál"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33942,19 +34407,4 @@
 msgstr "Sicily - Itálie"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Označená cesta neobsahuje vybraný uzel."
-#~ msgstr[1] "Označené cesty neobsahují vybraný uzel."
-#~ msgstr[2] "Označené cesty neobsahují vybrané uzly."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Stupně minuty sekundy"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Zadejte komentář k nahrávání (min. 3 znaky)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)"
-
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -34188,4 +34638,10 @@
 #~ msgstr "Klikněte na obnovit pro aktualizaci seznamu"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Označená cesta neobsahuje vybraný uzel."
+#~ msgstr[1] "Označené cesty neobsahují vybraný uzel."
+#~ msgstr[2] "Označené cesty neobsahují vybrané uzly."
+
 #~ msgid "Conflicting relation"
 #~ msgstr "Konfliktní relace"
@@ -34213,13 +34669,4 @@
 #~ msgstr "YAHOO (GNOME oprava)"
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
-#~ "problémy, protože jiné objekty (které nevidíte) je mohou používat."
-#~ "<br>Opravdu je chcete smazat?"
-
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
@@ -34252,7 +34699,4 @@
 #~ "Server vrátil vnitřní chybu. Zkuste to za chvíli znovu nebo zkuste "
 #~ "zmenšit oblast."
-
-#~ msgid "Preparing..."
-#~ msgstr "Připravuji..."
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -34300,4 +34744,7 @@
 #~ msgstr[1] "{0} pluginy úspěšně aktualizovány. Prosím, restartujte JOSM."
 #~ msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM."
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Stupně minuty sekundy"
 
 #~ msgid "Only one node selected"
@@ -34577,7 +35024,4 @@
 #~ "Toto může vést k nechtěnému smazání používaných uzlů.\n"
 #~ "Opravdu chcete pokračovat?"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Přesto pokračovat"
 
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
@@ -35182,7 +35626,4 @@
 #~ msgstr "Smazat vše"
 
-#~ msgid "Confirmation"
-#~ msgstr "Potvrzení"
-
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Mazání vrstvy {0} z {1}"
@@ -35471,4 +35912,10 @@
 #~ "</b> Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. "
 #~ "<b>Výběr:</b> Držet pravá tlačítko myši a nakreslit rámeček."
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "Prosím zadejte komentář k nahrávání této sady změn (min. 3 znaky)"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Zadejte komentář k nahrávání (min. 3 znaky)"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 22626)
+++ applications/editors/josm/i18n/po/da.po	(revision 22628)
@@ -9,6 +9,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-31 09:55+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-07 01:14+0000\n"
 "Last-Translator: Lasse Luttermann <luttermann@silenzio.dk>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -26,6 +26,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -229,4 +229,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -238,4 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -245,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -300,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Annuller"
@@ -366,4 +368,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -422,5 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1381,5 +1384,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1447,4 +1450,53 @@
 msgid "Preferences"
 msgstr "Indstillinger"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Landmåler..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "burger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Bekræftelse"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "føj til markering"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1486,4 +1538,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1721,4 +1774,5 @@
 msgstr "Vælg venligst mindst en vej at forenkle"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1726,4 +1780,5 @@
 #: ../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 "Ja"
@@ -1772,8 +1827,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Det markerede kan ikke opdeles"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2982,4 +3036,5 @@
 
 #. 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
@@ -3009,5 +3064,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3224,8 +3279,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Du er ved at slette punkter uden for det område du har downloadet.<br>Dette "
+"kan medføre problemer, fordi andre objekter (som du ikke kan se) måske "
+"bruger dem.<br>Ønsker du virkelig at slette?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3256,10 +3315,5 @@
 msgstr[1] "Flyt {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Udrensede objekt ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3269,4 +3323,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Udrensede objekt ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3673,5 +3733,5 @@
 "allerede er inkluderet"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3684,6 +3744,6 @@
 "ikke en kritisk fejl, så det skulle være sikkert at fortsætte dit arbejde."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3693,10 +3753,12 @@
 msgstr "Manglende sammenlægningsmål for vej med id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Manglende sammenlægningsmål for objekt med id {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3704,5 +3766,5 @@
 msgstr "Manglende sammenlægningsmål for punkt med id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3711,5 +3773,5 @@
 msgstr "Manglende sammenlægningsmål for relation med id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3718,4 +3780,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Manglende sammenlægningsmål af type {0} med id {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4020,5 +4090,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "jernbane"
@@ -4293,69 +4363,69 @@
 msgstr "Adgangskode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "brug"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "valgmuligheder"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Vis denne hjælp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometrisk argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Download afgrænsningsfeltet"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download stedet fra URL'en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Åbn en fil (enhver filtype der kan åbnes med Fil/Åbn)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Download afgrænsningsfeltet som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download stedet ved URL'en (med bredde=x&længde=y&zoom=z) som rå GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Vælg med den givne søgning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Start op i maksimeret tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Nulstil indstillingerne til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Indstil sproget"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "options givet som Java systemegenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/STI/TIL/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Ændr folderen for alle bruger indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4369,9 +4439,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4379,45 +4449,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Vær sikker på at du indlæser nogle data hvis du bruger --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Initialiserer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Opdaterer plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Installerer opdaterede plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Henter indledende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Sætter standardværdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Opretter hovedgrænseflade"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Henter udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4426,14 +4496,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Indstilling {0} er blevet fjernet eftersom den ikke længere er i brug."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4452,10 +4538,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Vis"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4463,5 +4549,5 @@
 msgstr "Funktioner"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4469,5 +4555,5 @@
 msgstr "Fordefinerede"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4478,5 +4564,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Lyd"
@@ -4576,17 +4662,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Numerisk"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "kinesisk"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Mindesmærke"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5333,5 +5416,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "alle"
@@ -5995,5 +6078,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relationer"
@@ -6088,10 +6171,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Markér i relationsliste"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Markér relation i relationsliste."
@@ -6701,4 +6784,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7160,5 +7245,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7202,111 +7286,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Navn"
@@ -8397,21 +8482,25 @@
 msgstr "Omdøb det markerede bogmærke"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min. bredde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min. længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "maks. bredde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "maks. længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8421,10 +8510,10 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Omkransende område"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8433,15 +8522,15 @@
 msgstr "Strengen ''{0}'' er ikke en gyldig double-værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Værdi for breddegrad i intervallet [-90,90] krævet."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Værdi for længdegrad i intervallet [-180,180] krævet."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8594,8 +8683,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Type"
@@ -8624,6 +8713,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "ukendt"
@@ -9036,7 +9125,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Ulovlig upload-kommentar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9241,7 +9329,9 @@
 msgstr "Vælg filnavn"
 
+#. 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 "Nej"
@@ -9555,17 +9645,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Ulovlig upload-kommentar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Omvendt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Fortsæt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9583,7 +9670,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Klik for at gå tilbage til upload-dialogen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9592,7 +9678,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Vis ikke igen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9795,5 +9880,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9987,5 +10072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Beskrivelse"
@@ -11700,5 +11785,5 @@
 msgstr "Farver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11709,35 +11794,35 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Fremtving linjer, hvis ingen segmenter blev importeret."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Tegn en cirkel udfra HDOP-værdi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighed (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Opløsning af position (rød = høj, grøn = lav, hvis tilgængelig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkelt farve (kan justeres for navngivne lag)"
@@ -11745,5 +11830,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11765,5 +11850,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11805,5 +11890,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11817,64 +11902,70 @@
 msgstr "Gående"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspile."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig optegning (ser grimmere ud)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Kun relevante retningsvisere (fx ved ensrettede veje)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Kun ved enden af vejen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Tegn numre for segment-rækkefølgen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn grænserne for downloadet data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle punkter i valg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i anden farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Udglattet kortgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Forfatter"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Båd"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11883,9 +11974,9 @@
 "Lav automatisk et markørlag udfra ethvert vejpunkt ved åbning af et GPX-lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellem rå GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11895,9 +11986,9 @@
 "for at tegne alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Maksimal længde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11906,10 +11997,10 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maksimal længde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11918,10 +12009,10 @@
 "information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspile for linjer, som forbinder GPS-punkter."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11929,5 +12020,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11935,13 +12026,13 @@
 msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Mindste afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11950,9 +12041,9 @@
 "Alle punkter og spor-segmenter får samme farve. Kan justeres i laghåndtering."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Farvelægger punkter og spor efter hastighed."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11960,46 +12051,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillader at justere sporfarven for forskellige gennemsnitshastigheder."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Farvelægning af spor og punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "WayPoint billede"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningsvisere på vejstykker"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn ordensnumrene på alle segmenter i deres vej."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Brug udjævning på kortvisningen for et mere glat udseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omridset af data hentet fra serveren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12007,9 +12097,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en anden farve."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -12378,7 +12468,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Mål"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13262,5 +13351,5 @@
 msgstr "Fortolker svar fra server..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14887,5 +14976,5 @@
 "<br><br>Fejlmeddelelsen er: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14915,5 +15004,5 @@
 "konfigurationsproblem. JOSM vil holde op med at virke."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15163,5 +15252,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -15611,5 +15700,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Bygninger"
@@ -15848,5 +15937,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17819,7 +17908,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "udredet udgave:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18444,13 +18532,13 @@
 msgstr "Rækkehus"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Ret skobutik"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Separator"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19534,5 +19622,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21565,5 +21653,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Reference"
@@ -22102,5 +22190,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "metal"
@@ -22113,5 +22201,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "træ"
@@ -22389,4 +22477,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22415,9 +22565,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "ja"
@@ -22527,9 +22708,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "nej"
@@ -22953,5 +23165,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "vandring"
@@ -22986,5 +23198,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22998,5 +23210,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -23125,4 +23345,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23154,14 +23382,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Selskab"
@@ -23423,12 +23655,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Højde"
@@ -24280,5 +24512,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Spænding"
@@ -24590,6 +24822,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24641,32 +24875,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Åbningstider"
@@ -24675,4 +24909,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24725,174 +24960,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mandag-Fredag 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24922,7 +25157,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Referensenummer"
@@ -24938,5 +25173,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "underjordisk"
@@ -24949,6 +25184,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Gebyr"
@@ -25124,5 +25359,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "kørestol"
@@ -25159,6 +25394,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Læskur"
@@ -25166,5 +25401,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Bænk"
@@ -25283,5 +25518,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -25341,11 +25576,241 @@
 msgstr "Ret hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -25353,20 +25818,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Ret motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Gæstehus"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Ret gæstehus"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Feriehytte"
@@ -25374,10 +25839,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Ret feriehytte"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Vandrerhjem"
@@ -25385,30 +25850,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Ret vandrerhjem"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Alpin hytte"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Ret alpin hytte"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Campingplads"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Ret campingplads"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Camping plads"
@@ -25416,10 +25881,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Ret campingplads"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Mad+drikke"
@@ -25430,5 +25895,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -25436,11 +25901,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Ret restaurant"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Køkken"
@@ -25448,78 +25913,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -25527,17 +25993,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Café"
@@ -25545,9 +26023,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Ret café"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -25555,19 +26034,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Ret pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Ret biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -25575,9 +26055,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Ret bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Natklub"
@@ -25585,24 +26066,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Ret natklub"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museum"
@@ -25610,9 +26092,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Ret museum"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -25621,9 +26103,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Ret zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Udsigtspunkt"
@@ -25631,24 +26113,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Ret udsigtspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Forlystelsespark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Ret forlystelsespark"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Kunstværk"
@@ -25656,5 +26138,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Ret kunstværk"
@@ -25662,19 +26144,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Informationskontor"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25712,5 +26194,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25718,28 +26200,28 @@
 msgstr "gade"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Vist område"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "sted"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "by"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Nærmere beskrivelse"
@@ -25749,5 +26231,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Ruter vist for:"
@@ -25755,5 +26237,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Vandring"
@@ -25761,6 +26243,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Cykling"
@@ -25768,5 +26250,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -25774,6 +26256,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Skisport"
@@ -25781,5 +26263,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Ridning"
@@ -25787,54 +26269,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "historie"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Guide post"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "stang"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Informations terminal"
@@ -25842,29 +26323,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audio guide"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Audio guide via mobiletelefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Andre informations punkter"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Ret shelter"
@@ -25872,25 +26353,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Bålplads"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Picnic sted"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Ret picnic sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Borg"
@@ -25899,19 +26380,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -25920,9 +26401,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Ret arkæologisk sted"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -25930,10 +26411,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Ret slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Palæontologisk sted"
@@ -25941,5 +26422,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Ret palæontologisk sted"
@@ -25947,15 +26428,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -25963,55 +26444,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Vejkantskors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Ret vejkantskors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Grænsesten"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Ret grænsesten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Legeplads"
@@ -26019,35 +26500,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -26061,6 +26542,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -26476,6 +26957,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26510,240 +26991,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Væddeløbsbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Ret væddeløbsbane"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -26785,23 +27266,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "type"
@@ -26843,211 +27324,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "sportshal"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "spor"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Ret kanosport"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Ret cykling"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Ret svømning"
@@ -27055,52 +27536,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "styrtløb"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "skiløb"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Sværhedsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "let"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "avanceret"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Skydning"
@@ -27108,204 +27589,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Petanque"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Menneskeskabt"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Bygning"
@@ -27313,5 +27794,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -27319,10 +27800,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Rådhus"
@@ -27330,10 +27811,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Ambassade"
@@ -27341,10 +27822,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Domhus"
@@ -27353,10 +27834,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Fængsel"
@@ -27365,10 +27846,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Politi"
@@ -27378,10 +27859,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -27390,10 +27871,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Posthus"
@@ -27401,5 +27882,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -27407,15 +27888,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Skole"
@@ -27423,10 +27904,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Universitet"
@@ -27434,10 +27915,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Videregående udd."
@@ -27445,5 +27926,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Ret videregående udd."
@@ -27451,5 +27932,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Biograf"
@@ -27458,10 +27939,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Bibliotek"
@@ -27470,9 +27951,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -27480,10 +27961,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Ret kunstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teater"
@@ -27492,10 +27973,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -27505,5 +27986,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -27512,6 +27993,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religion"
@@ -27520,66 +28001,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitar"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Trosretning"
@@ -27588,81 +28069,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adresser"
@@ -27671,5 +28152,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Ret adresseinformation"
@@ -27677,5 +28158,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Husnummer"
@@ -27683,25 +28164,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Vejnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Landekode"
@@ -27710,5 +28191,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Ret adresse-interpolering"
@@ -27716,61 +28197,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Type af tårn"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "kommunikation"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Højde (meter)"
@@ -27778,25 +28259,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -27804,10 +28285,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -27815,10 +28296,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -27827,41 +28308,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "varme"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "olie"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "Spildevand"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Sted"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "undervands"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "på land"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -27871,10 +28352,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Kran"
@@ -27882,5 +28363,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Ret kran"
@@ -27888,10 +28369,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Målepunkt"
@@ -27899,10 +28380,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Ret målepunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -27910,23 +28391,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Generator"
@@ -27936,35 +28417,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "sol"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -27973,10 +28454,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -27985,5 +28466,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -27991,10 +28472,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Linie reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Elmast"
@@ -28005,23 +28486,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "tårn"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "stang"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Tårn reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -28030,20 +28511,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Linie type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28051,55 +28532,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "enkelt"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "dobbelt"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "tredobbelt"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "firdobbelt"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toiletter"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefon"
@@ -28108,5 +28589,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -28114,5 +28595,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Mønter"
@@ -28120,5 +28601,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Sedler"
@@ -28126,5 +28607,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Elektroniske punge og betalingskort"
@@ -28132,5 +28613,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Kreditkort"
@@ -28138,15 +28619,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Genbrug"
@@ -28155,5 +28636,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -28161,35 +28642,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -28197,5 +28678,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -28204,31 +28685,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "sten"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plastik"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Farve"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "sort"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "brun"
@@ -28307,5 +28788,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28315,31 +28796,31 @@
 msgstr "grøn"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "rød"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "blå"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "grå"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "hvid"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Antal sæder"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
@@ -28348,30 +28829,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Springvand"
@@ -28380,10 +28861,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -28392,10 +28873,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -28404,5 +28885,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28410,5 +28891,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -28416,15 +28897,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Bilforhandler"
@@ -28432,10 +28913,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Ret bilforhandler"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Cykelhandler"
@@ -28444,28 +28925,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Ret cykelhandler"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Købmand"
@@ -28473,9 +28954,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Ret købmand"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -28483,27 +28964,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Ret kiosk"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Boghandler"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Ret boghandler"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Rejsebureau"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Ret rejsebureau"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Slagter"
@@ -28511,9 +28992,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Ret slagter"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Bager"
@@ -28521,9 +29002,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Ret bager"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Blomsterhandler"
@@ -28531,18 +29012,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Ret blomsterhandler"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Ret økologisk forretning"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Sprit"
@@ -28550,54 +29031,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Ret spritbutik"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Drikkevarer"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Ret drikkevarebutik"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Ret computerforretning"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Ret elektronikforretning"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hi-fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Ret hi-fi-forhandler"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Møbelforretning"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Ret møbelforretning"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Havecenter"
@@ -28605,9 +29086,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Ret havecenter"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Isenkræmmer"
@@ -28615,9 +29096,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Ret isenkræmmer"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Gør-det-selv-butik"
@@ -28625,54 +29106,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Ret gør-det-selv-butik"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Ret frisør"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Ret skobutik"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Legetøjsbutik"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Ret legetøjsbutik"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Ret videobutik"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Kemisk renseri"
@@ -28680,9 +29161,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Ret kemisk renseri"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -28690,9 +29171,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Ret vaskeri"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr ""
@@ -28700,24 +29181,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Ret sportsbutik"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Ret optiker"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Automat"
@@ -28725,5 +29206,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Ret automat"
@@ -28731,97 +29212,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "slik"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Bank"
@@ -28829,14 +29310,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Ret bank"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -28844,5 +29325,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Ret vekselkontor"
@@ -28850,15 +29331,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Lægehus"
@@ -28866,18 +29347,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Ret lægehus"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -28885,5 +29366,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Ret apotek"
@@ -28891,9 +29372,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Håndkøb"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Hospital"
@@ -28901,10 +29382,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr ""
@@ -28913,5 +29394,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28920,20 +29401,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -28941,5 +29417,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -28948,64 +29424,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Steder"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Ret land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Stat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Amt"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Ret amt"
@@ -29013,15 +29489,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Ret storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "By"
@@ -29029,10 +29505,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Ret By"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Forstad"
@@ -29040,25 +29516,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Mindre by"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Ret mindre by"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
@@ -29066,5 +29542,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Egn"
@@ -29072,10 +29548,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Ø"
@@ -29083,10 +29559,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Ret ø"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -29094,5 +29570,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -29100,5 +29576,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -29106,10 +29582,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Ret huleindgang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Tinde"
@@ -29117,10 +29593,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Ret tinde"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -29128,10 +29604,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Ret gletsjer"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Vulkan"
@@ -29139,70 +29615,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Ret vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Træ"
@@ -29211,15 +29687,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Naturskov"
@@ -29228,5 +29704,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Ret naturskov"
@@ -29234,17 +29710,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "Nåleskov"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "blandet"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Skov"
@@ -29253,14 +29729,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Ret skovområde"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
@@ -29268,25 +29744,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Ur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Ret ur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Krat"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Ret krat"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Fjeldområde"
@@ -29294,10 +29770,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Ret fjeldområde"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Hede"
@@ -29305,5 +29781,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Ret hede"
@@ -29311,5 +29787,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -29318,45 +29794,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Jordbrugsland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Ret landbrugsland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -29364,25 +29840,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Have"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Græs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -29390,10 +29866,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr ""
@@ -29401,20 +29877,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -29422,5 +29898,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -29428,15 +29904,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Gravplads"
@@ -29444,9 +29920,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Ret gravplads"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -29454,39 +29930,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industri"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr ""
@@ -29494,15 +29970,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militært område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -29510,50 +29986,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Losseplads"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Ret losseplads"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
@@ -29563,5 +30039,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Ret multipolygon"
@@ -29573,5 +30049,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "ydre segment"
@@ -29579,5 +30055,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "indre segment"
@@ -29585,5 +30061,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29594,5 +30070,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29600,36 +30076,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29637,5 +30113,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr ""
@@ -29644,5 +30120,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29650,34 +30126,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "ingen_venstre_sving"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "ingen_højre_sving"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "ingen_lige_ud"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "ingen_u_vendinger"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "kun_højre_sving"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "kun_venstre_sving"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "kun_lige_ud"
@@ -29686,15 +30162,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "fra vej"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "til vej"
@@ -29702,5 +30178,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Rute"
@@ -29709,5 +30185,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Ret rute"
@@ -29715,5 +30191,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Rutetype"
@@ -29821,5 +30297,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29830,17 +30306,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ski"
@@ -29908,5 +30384,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29916,9 +30392,9 @@
 msgstr "fod"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "sporvogn"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "omvej"
@@ -29932,10 +30408,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -29943,31 +30419,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Netværk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "skiftende"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Farve (hex)"
@@ -29976,30 +30452,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -31177,16 +31653,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34105,18 +34569,4 @@
 msgstr "Sicilen - Italien"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Den valgte vej indeholder ikke det valgte punkt."
-#~ msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grader minutter sekunder"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Indtast en upload-kommentar (min. 3 tegn)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "Indtast en kommentar for dette upload-rettesæt (min 3 tegn)"
-
 #~ msgid "Move"
 #~ msgstr "Flyt"
@@ -34341,4 +34791,7 @@
 #~ msgstr "Opdel vejstykke"
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grader minutter sekunder"
+
 #~ msgid "different"
 #~ msgstr "anderledes"
@@ -34380,4 +34833,9 @@
 #~ msgid "Email"
 #~ msgstr "E-mail"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Den valgte vej indeholder ikke det valgte punkt."
+#~ msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter."
 
 #~ msgid "unnamed"
@@ -34731,7 +35189,4 @@
 #~ msgid "error requesting update"
 #~ msgstr "fejl ved anmodning af opdatering"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Fortsæt alligevel"
 
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
@@ -35196,4 +35651,7 @@
 #~ msgstr "Ulovlig double værdi {0}"
 
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Manglende sammenlægningsmål for objekt med id {0}"
+
 #~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
 #~ msgstr "Parameter \"{0}\" >= 0 forventet. Fik {1}."
@@ -35216,7 +35674,4 @@
 #~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
 #~ msgstr "Parameter \"{0}\" > 0 forventet. Fik {1}."
-
-#~ msgid "Confirmation"
-#~ msgstr "Bekræftelse"
 
 #~ msgid "football"
@@ -35362,12 +35817,9 @@
 #~ "adgangskode."
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Du er ved at slette punkter uden for det område du har downloadet."
-#~ "<br>Dette kan medføre problemer, fordi andre objekter (som du ikke kan "
-#~ "se) måske bruger dem.<br>Ønsker du virkelig at slette?"
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Indtast en upload-kommentar (min. 3 tegn)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "Indtast en kommentar for dette upload-rettesæt (min 3 tegn)"
 
 #~ msgid "Errors during Download"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 22626)
+++ applications/editors/josm/i18n/po/de.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-04 16:49+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-11 14:25+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: <de@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 21:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -229,4 +229,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -238,4 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -245,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -300,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -368,4 +370,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -424,5 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1395,5 +1398,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1460,4 +1463,53 @@
 msgid "Preferences"
 msgstr "Einstellungen"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Vermessung..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "Hamburger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Pluginquellen bearbeiten"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "zur Auswahl hinzufügen"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1499,4 +1551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1735,4 +1788,5 @@
 msgstr "Bitte mindestens einen Weg zum Vereinfachen auswählen."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1740,4 +1794,5 @@
 #: ../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 "Ja"
@@ -1786,8 +1841,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden."
+msgstr ""
+"Die aktuelle Auswahl kann nicht getrennt werden - kein Punkt(node) ist "
+"ausgewählt."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3041,4 +3097,5 @@
 
 #. 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
@@ -3068,5 +3125,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3285,7 +3342,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Sie wollen unvollständige Objekte löschen.<br>Das kann zu Problemen führen, "
@@ -3320,10 +3378,5 @@
 msgstr[1] "{0} Knoten bewegen"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Das Objekt ''{0}'' wurde entfernt"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3333,4 +3386,10 @@
 msgstr[1] "{0} Objekte wurden entfernt"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Das Objekt ''{0}'' wurde entfernt"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3707,5 +3766,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "deg° min'' sec\""
-msgstr ""
+msgstr "Grad° Min\" Sek''"
 
 #. *
@@ -3714,5 +3773,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "deg° min'' (Nautical)"
-msgstr ""
+msgstr "Grad° Min\" (nautisch)"
 
 #. *
@@ -3751,5 +3810,5 @@
 "enthalten ist"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3763,6 +3822,6 @@
 "JOSM fortsetzen können."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3773,12 +3832,12 @@
 "Beim Zusammenführen wurde der Ziel-Weg für den Weg mit ID {0} nicht gefunden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-"Beim Zusammenführen wurde das Ziel-Objekt für das Objekt mit ID {0} nicht "
-"gefunden"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3788,5 +3847,5 @@
 "gefunden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3797,5 +3856,5 @@
 "nicht gefunden"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3806,4 +3865,12 @@
 "Beim Zusammenführen wurde das Ziel-Objekt vom Type {0} für das Objekt mit ID "
 "{1} nicht gefunden"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4113,5 +4180,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "Eisenbahn"
@@ -4389,70 +4456,70 @@
 msgstr "Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "Optionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Bounding Box herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Eine Datei öffnen (jeder Dateityp, welcher von Datei/Öffnen unterstützt wird)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Bounding Box als GPS-Spuren herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "GPS-Daten am Ort der URL (mit lat=x&lon=y&zoom=z) herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Mit der angegebenen Suche auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Mit maximiertem Fenster starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Standardwerte zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Sprache einstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "Optionen über die Java-Systemeinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PFAD/ZU/JOSM/ORDNER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4466,9 +4533,9 @@
 "festgelegt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4478,46 +4545,46 @@
 "Reihenfolge verarbeitet."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "Stellen Sie sicher, dass sie Daten laden, falls Sie --selection verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Initialisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Plugins aktualisieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Aktualisierte Plugins installieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Zeitige Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Voreinstellungen setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Hauptfenster erzeugen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr "Nicht gespeicherte osm-Daten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4528,14 +4595,33 @@
 "zuletzt abgestürzt. Wollen sie die Daten wiederherstellen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+"<h2>JOSM benötigt die Java Version 6.</h2>Ermittelte Java Version: {0}.<br> "
+"<ul><li>Java aktualisieren(JRE) oder</li><li>eine frühere (Java 5 "
+"Kompatible) Version des JOSM nutzen.</li></ul>Weitere Informationen:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr "JOSM Verlassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr "Fortfahren, trotzdem versuchen"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Datei"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4554,10 +4640,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Ansicht"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4565,5 +4651,5 @@
 msgstr "Werkzeuge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4571,5 +4657,5 @@
 msgstr "Vorlagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4580,5 +4666,5 @@
 msgstr "Menü: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4678,17 +4764,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Numerisch"
+msgstr "Metrisch"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "chinesisch"
+msgstr "Chinesisch"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Gewerbegebiet"
+msgstr "Britisches System"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5445,5 +5528,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "alle"
@@ -6119,5 +6202,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relationen"
@@ -6213,10 +6296,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "In Relationsliste auswählen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Relation in Relationsliste auswählen."
@@ -6833,4 +6916,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7292,5 +7377,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7334,111 +7418,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Name"
@@ -8565,21 +8650,25 @@
 msgstr "Benennt das ausgewählte Lesezeichen um"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min Breite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max Breite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr "Textfeld leeren"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8589,10 +8678,10 @@
 "zu laden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Koordinaten"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8601,15 +8690,15 @@
 msgstr "Die Zeichenkette ''{0}'' ist kein gültiger Gleitkommawert."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Als Breitengrad wird ein Wert im Intervall [-90,90] erwartet."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "AlsLängengrad wird ein Wert im Intervall  [-180,180] erwartet."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8759,8 +8848,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Typ"
@@ -8789,6 +8878,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "unbekannt"
@@ -9228,7 +9317,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Ungültiger Kommentar"
+msgstr "Kommentar zum Hochladen eingeben"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9438,7 +9526,9 @@
 msgstr "Dateinamen wählen"
 
+#. 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 "Nein"
@@ -9779,17 +9869,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Ungültiger Kommentar"
+msgstr "Bitte den Kommentar überdenken"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Umkehren"
+msgstr "Überarbeiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Fortfahren"
+msgstr "Trotzdem fortsetzen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9801,22 +9888,27 @@
 "explain your change, you will make life<br />easier for many other mappers."
 msgstr ""
+"Die Hochladebeschreibung ist <i>leer</i>, oder <i>sehr kurz</i>.<br /><br /"
+">Dies ist technisch erlaubt, aber es ist zu beachten, dass viele Nutzer,<br /"
+">welche die Änderungen in ihrer Umgebung beobachten, auf nützliche "
+"Beschreibungen angewiesen sind,<br />um zu verstehen was geändert wurde!<br /"
+"><br />Wenn Du kurz erklärst was du geändert hast, erleichterst Du<br />die "
+"Arbeit vieler anderer Nutzer."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
 msgid "Return to the previous dialog to enter a more descriptive comment"
 msgstr ""
+"Zum vorherigen Dialog zurückkehren um eine bessere Beschreibung einzugeben"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Abbrechen und zum Editor zurückkehren"
+msgstr "Abbrechen und zum vorherigen Dialog zurückkehren"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
 msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Hinweis ignorieren und Hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Nicht noch einmal zeigen"
+msgstr "Diese Meldung nicht mehr anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -10031,5 +10123,5 @@
 msgstr[1] "{0} Objekte hochladen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10226,5 +10318,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Beschreibung"
@@ -12016,5 +12108,5 @@
 msgstr "Farben"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12025,36 +12117,36 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokale Dateien"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Keine"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Linien erzwingen, wenn keine Abschnitte importiert wurden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Große GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Kreisförmig die Genauigkeit des GPS-Signals (HDOP) anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Geschwindigkeit (rot = langsam, grün = schnell)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Positionsverschlechterung (rot = hoch, grün = niedrig; nur wenn verfügbar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)"
@@ -12062,5 +12154,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12082,5 +12174,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12122,5 +12214,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12134,65 +12226,70 @@
 msgstr "Zu Fuß"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Richtungspfeile zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Schnelles Zeichnen (schlechtere Qualität)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Nur am Ende des Weges"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Ordnungsnummer des Abschnitts anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Begrenzung der heruntergeladenen Daten zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuelle Knoten im Auswahlmodus zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Inaktive Ebenen in anderer Farbe zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glätten der Kartengrafik (Anti-Aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Marken beim Einlesen von GPX erstellen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr "Automatisch"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Name"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Beschreibung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Nord"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr "Beide"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12202,9 +12299,9 @@
 "geöffnet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Linien zwischen GPS-Rohdatenpunkten zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12214,9 +12311,9 @@
 "\"-1\", um alle Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Maximallänge für lokale Dateien (Meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12225,10 +12322,10 @@
 "Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maximallänge (Meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12237,10 +12334,10 @@
 "Informationen enthalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtungspfeile an Linien zwischen GPS-Punkten zeichnen."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12249,5 +12346,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12256,13 +12353,13 @@
 "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Mindestabstand (Pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Größere Punkte für GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12272,9 +12369,9 @@
 "Ebenenübersicht angepasst werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12284,5 +12381,5 @@
 "Ihr GPS-Empfänger muss diese Information aufzeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12290,32 +12387,31 @@
 "Durchschnittsgeschwindigkeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Färbung von GPS-Spuren und Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+msgstr "Erlaubt das Ändern der Beschriftung der GPS-Wegpunkte."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Wegpunktbeschreibung"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr "Wegpunkt-Beschriftung"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS-Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Richtungspfeile für Wegabschnitte zeichnen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Ordnungsnummer für alle Abschnitte innerhalb des Weges anzeigen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12324,10 +12420,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12336,9 +12432,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM-Daten"
@@ -12740,7 +12836,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Ebene für Messungen"
+msgstr "Einheitendarstellung"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13682,5 +13777,5 @@
 msgstr "Server-Antwort wird verarbeitet..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -15449,5 +15544,5 @@
 "<br><br>Die Fehlermeldung lautet:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15481,5 +15576,5 @@
 "schwerwiegendes Konfigurationsproblem."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15748,5 +15843,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -16285,5 +16380,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Gebäude"
@@ -16538,5 +16633,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -18580,7 +18675,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "Vereinigte Version"
+msgstr "Protokollversion lesen"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -19211,13 +19305,13 @@
 msgstr "Abteilen"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Schuhladen bearbeiten"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Trenner"
+msgstr "Seezeicheneditor"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20389,5 +20483,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -22475,5 +22569,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Referenz"
@@ -23012,5 +23106,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "Metall"
@@ -23023,5 +23117,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "Holz"
@@ -23299,4 +23393,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -23325,9 +23481,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "ja"
@@ -23437,9 +23624,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "nein"
@@ -23863,5 +24081,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "Wandern"
@@ -23896,5 +24114,5 @@
 msgstr "gut"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "mittelschwer"
@@ -23908,5 +24126,13 @@
 msgstr "sehr schlecht"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Rollstuhl"
@@ -24035,4 +24261,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -24064,14 +24298,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Betreiber"
@@ -24333,12 +24571,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Höhe"
@@ -25190,5 +25428,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Spannung"
@@ -25500,6 +25738,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -25551,32 +25791,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
@@ -25585,4 +25825,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -25635,174 +25876,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr "Mit Kiosk"
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Kraftstoffsorten:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (teilweise synthetisch, V-Power etc.)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel für LKW"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "Normalbenzin"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "Super"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "Super plus"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "100 Oktan"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol Gemisch)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol Gemisch)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Flüssiggas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (komprimiertes Erdgas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr "1:25 Gemisch (Mofa/Moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "1:50 Gemisch (Mofa/Moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr "Mit Kiosk"
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25832,7 +26074,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Referenznummer"
@@ -25848,5 +26090,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "Tiefgarage"
@@ -25859,6 +26101,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Gebühr"
@@ -26034,5 +26276,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -26069,6 +26311,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Schutzraum"
@@ -26076,5 +26318,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Sitzbank"
@@ -26193,5 +26435,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Bake"
@@ -26251,11 +26493,241 @@
 msgstr "Hotel bearbeiten"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Sterne"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr "Internetzugang"
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr "WLAN"
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr "Kabel"
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "Terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr "Internetgebühr"
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr "Rauchen"
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr "gewidmet"
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr "separat"
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr "isoliert"
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr "Faxnummer"
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr "Webseite"
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr "E-Mail-Adresse"
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -26263,20 +26735,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Motel bearbeiten"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -26284,10 +26756,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Ferienhaus bearbeiten"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -26295,30 +26767,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Jugendherberge bearbeiten"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -26326,10 +26798,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Campingplatz bearbeiten"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -26340,5 +26812,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26346,11 +26818,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Restaurant bearbeiten"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Küche"
@@ -26358,78 +26830,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "französisch"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "Sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "Sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
-msgstr ""
-
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+msgstr "Kleinbrauerei"
+
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -26437,17 +26910,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "Fish and Chips"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "Hähnchen"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Café"
@@ -26455,9 +26940,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Kneipe"
@@ -26465,19 +26951,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -26485,9 +26972,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -26495,24 +26983,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museum"
@@ -26520,9 +27009,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Museum bearbeiten"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -26531,9 +27020,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Zoo bearbeiten"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -26541,24 +27030,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Themenpark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Themenpark bearbeiten"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Kunstausstellung"
@@ -26566,5 +27055,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Kunstausstellung bearbeiten"
@@ -26572,19 +27061,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Informationsbüro"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Karte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Detailgrad"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topographisch"
@@ -26622,5 +27111,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26628,28 +27117,28 @@
 msgstr "Straße"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "schematisch"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Kartenausschnitt"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "Örtlichkeit"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "Stadt"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Nähere Beschreibung"
@@ -26659,5 +27148,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Dargestellte Routen für:"
@@ -26665,5 +27154,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Wanderweg"
@@ -26671,6 +27160,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Radfahren"
@@ -26678,5 +27167,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Mountainbike fahren"
@@ -26684,6 +27173,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Skifahren"
@@ -26691,5 +27180,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Reiten"
@@ -26697,54 +27186,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "...andere mögliche Transportarten"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Inhalt"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "Notiz"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "Wildtiere"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "Pflanzen"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Wegweiser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "Mast"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Informationsterminal"
@@ -26752,29 +27240,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Nähere Beschreibung"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide per Handy?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
@@ -26782,25 +27270,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -26809,19 +27297,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -26830,9 +27318,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -26840,10 +27328,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Schlachtfeld bearbeiten"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Paläontologische Stätte"
@@ -26851,5 +27339,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Paläontologische Stätte bearbeiten"
@@ -26857,15 +27345,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -26873,55 +27361,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Grenzstein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Grenzstein bearbeiten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Spielplatz"
@@ -26929,35 +27417,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -26971,6 +27459,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -27386,6 +27874,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27420,240 +27908,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "American Football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "Canadian Football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr "Gaelic Football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr "Rugby League"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr "Rugby Union"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -27695,23 +28183,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "Typ"
@@ -27753,211 +28241,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "Weg"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
@@ -27965,52 +28453,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Schießen"
@@ -28018,204 +28506,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Australian Football-Platz bearbeiten"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr "American Football ändern"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr "Canadian Football"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr "Canadian Football ändern"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr "Gaelic Football"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr "Gaelic Football ändern"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr "Rugby League"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr "Rugby League ändern"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr "Rugby Union"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr "Rugby Union ändern"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Gebäude"
@@ -28223,5 +28711,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -28229,10 +28717,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäude bearbeiten"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Rathaus"
@@ -28240,10 +28728,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Botschaft"
@@ -28251,10 +28739,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Gericht"
@@ -28263,10 +28751,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Gefängnis"
@@ -28275,10 +28763,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Polizei"
@@ -28288,10 +28776,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -28300,10 +28788,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Post"
@@ -28311,5 +28799,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -28317,15 +28805,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Schule"
@@ -28333,10 +28821,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Universität"
@@ -28344,10 +28832,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Hochschule"
@@ -28355,5 +28843,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -28361,5 +28849,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Kino"
@@ -28368,10 +28856,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Bibliothek"
@@ -28380,9 +28868,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -28390,10 +28878,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Theater"
@@ -28402,10 +28890,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -28415,5 +28903,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -28422,6 +28910,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religion"
@@ -28430,66 +28918,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Konfession"
@@ -28498,81 +28986,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adressen"
@@ -28581,5 +29069,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -28587,5 +29075,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Hausnummer"
@@ -28593,25 +29081,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Straßenname"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Länderkennung"
@@ -28620,5 +29108,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -28626,61 +29114,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alphabetisch"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Turm"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Art des Turms"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "Kommunikation"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "Beobachtung"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Höhe (in Meter)"
@@ -28688,25 +29176,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -28714,10 +29202,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Windmühle"
@@ -28725,10 +29213,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -28737,41 +29225,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "Gas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "Wärme"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "Öl"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "Abwasser"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "Beliebige Substanz"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Ort"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "Unter Wasser"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "oberirdisch"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -28781,10 +29269,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -28792,5 +29280,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
@@ -28798,10 +29286,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -28809,10 +29297,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -28820,23 +29308,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "im Gebäude"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "im Freien"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "öffentlich"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -28846,35 +29334,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -28883,10 +29371,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -28895,5 +29383,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -28901,10 +29389,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Strommast"
@@ -28915,23 +29403,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "Turm"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "Mast"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Identifikation des Turms"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -28940,20 +29428,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Art der Stromleitung"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr "Freileitung (Starkstrom)"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28961,55 +29449,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Anzahl Leitungen"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Anzahl der Adern (besser: Leiter) je Stromkabel"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "einzeln"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "doppelt"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "dreifach"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "vierfach"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limitiert"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefon"
@@ -29018,5 +29506,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -29024,5 +29512,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Münzen"
@@ -29030,5 +29518,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Scheine"
@@ -29036,5 +29524,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -29042,5 +29530,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -29048,15 +29536,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -29065,5 +29553,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -29071,35 +29559,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Abfalleimer"
@@ -29107,5 +29595,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Abfalleimer bearbeiten"
@@ -29114,31 +29602,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Lehne"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "Stein"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "Kunststoff"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Farbe"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "schwarz"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "braun"
@@ -29217,5 +29705,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -29225,31 +29713,31 @@
 msgstr "grün"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "rot"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "blau"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "grau"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "weiß"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Anzahl der Sitzplätze"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
@@ -29258,30 +29746,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Versteck"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Schloß"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -29290,10 +29778,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -29302,10 +29790,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -29314,5 +29802,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Hydrant bearbeiten"
@@ -29320,5 +29808,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -29326,15 +29814,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Autohändler"
@@ -29342,10 +29830,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Autohaus bearbeiten"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Fahrradladen"
@@ -29354,28 +29842,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Fahrradladen bearbeiten"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Drogerie bearbeiten"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -29383,9 +29871,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -29393,27 +29881,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Buchhandlung"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Buchhandlung bearbeiten"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Reisebüro"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Reisebüro bearbeiten"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Fleischer"
@@ -29421,9 +29909,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Fleischer bearbeiten"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Bäcker"
@@ -29431,9 +29919,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Bäcker bearbeiten"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Blumenladen"
@@ -29441,18 +29929,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Blumenladen bearbeiten"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Spirituosen"
@@ -29460,54 +29948,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Spirituosengeschäft bearbeiten"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Mobiliar"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -29515,9 +30003,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Gartenzentrum bearbeiten"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Haushaltswaren"
@@ -29525,9 +30013,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Haushaltswaren bearbeiten"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -29535,54 +30023,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -29590,9 +30078,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Chemische Reinigung bearbeiten"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -29600,9 +30088,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Waschsalon bearbeiten"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -29610,24 +30098,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Sportgeschäft bearbeiten"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -29635,5 +30123,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -29641,97 +30129,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr "Fahrradschlauch"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Bank"
@@ -29739,14 +30227,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -29754,5 +30242,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -29760,15 +30248,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Arzt"
@@ -29776,18 +30264,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -29795,5 +30283,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -29801,9 +30289,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -29811,10 +30299,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -29823,5 +30311,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -29830,20 +30318,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Punktname"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -29851,5 +30334,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -29858,64 +30341,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Orte"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Staat"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Bundesland"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Landkreis"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
@@ -29923,15 +30406,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Großstadt"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Stadt"
@@ -29939,10 +30422,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -29950,25 +30433,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Dorf"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -29976,5 +30459,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -29982,10 +30465,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Insel"
@@ -29993,10 +30476,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Kleine Insel"
@@ -30004,5 +30487,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Kleine Insel bearbeiten"
@@ -30010,5 +30493,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -30016,10 +30499,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Bergspitze"
@@ -30027,10 +30510,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Gletscher"
@@ -30038,10 +30521,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Vulkan"
@@ -30049,70 +30532,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Staat"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Zivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Politisch"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Baum"
@@ -30121,15 +30604,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Naturwald"
@@ -30138,5 +30621,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
@@ -30144,17 +30627,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Forst"
@@ -30163,14 +30646,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -30178,25 +30661,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Geröll"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Gebirge"
@@ -30204,10 +30687,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Gebirge bearbeiten"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Heide"
@@ -30215,5 +30698,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Heide bearbeiten"
@@ -30221,5 +30704,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -30228,45 +30711,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -30274,25 +30757,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Garten"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -30300,10 +30783,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -30311,20 +30794,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -30332,5 +30815,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -30338,15 +30821,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -30354,9 +30837,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -30364,39 +30847,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -30404,15 +30887,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -30420,50 +30903,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
@@ -30473,5 +30956,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -30483,5 +30966,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "Äußeres Segment"
@@ -30489,5 +30972,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -30495,5 +30978,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Grenze"
@@ -30504,5 +30987,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Grenze anpassen"
@@ -30510,36 +30993,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Grenztyp"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "administrativ"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "national"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "zivil"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "politisch"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Administrationsebene"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "Teilgebiet"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Administrationszentrum"
@@ -30547,5 +31030,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -30554,5 +31037,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -30560,34 +31043,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -30596,15 +31079,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "Zu Weg"
@@ -30612,5 +31095,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Route"
@@ -30619,5 +31102,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -30625,5 +31108,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Routentyp"
@@ -30731,5 +31214,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30740,17 +31223,17 @@
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "Ski"
@@ -30818,5 +31301,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30826,9 +31309,9 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "Umleitung"
@@ -30842,10 +31325,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -30853,31 +31336,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Routenstatus"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -30886,30 +31369,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -32087,16 +32570,4 @@
 msgstr "Rollweg"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "Terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -35015,29 +35486,15 @@
 msgstr "Sizilien - Italien"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Der gewählte Weg enthält nicht den gewählten Knoten."
-#~ msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Knoten."
+#~ msgid "Create non-audio markers when reading GPX."
+#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
+
+#~ msgid "football"
+#~ msgstr "American Football"
+
+#~ msgid "Football"
+#~ msgstr "American Football"
 
 #~ msgid "Degrees Minutes Seconds"
 #~ msgstr "Grad Minuten Sekunden"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr ""
-#~ "Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Bitte geben Sie einen Kommentar für den Änderungssatz ein (mind. 3 "
-#~ "Zeichen)."
-
-#~ msgid "Create non-audio markers when reading GPX."
-#~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen."
-
-#~ msgid "football"
-#~ msgstr "American Football"
-
-#~ msgid "Football"
-#~ msgstr "American Football"
 
 #~ msgid "Style for outer way ''{0}'' mismatches."
@@ -35158,4 +35615,13 @@
 #~ msgid "Apply also for children"
 #~ msgstr "Auch auf Kinder anwenden"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr ""
+#~ "Bitte einen Kommentar für den Änderungssatz eingeben. (mind. 3 Zeichen)"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr ""
+#~ "Beim Zusammenführen wurde das Ziel-Objekt für das Objekt mit ID {0} nicht "
+#~ "gefunden"
 
 #~ msgid ""
@@ -35190,4 +35656,14 @@
 #~ msgstr "Innenweg im Multipolygon ist außen."
 
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Bitte geben Sie einen Kommentar für den Änderungssatz ein (mind. 3 "
+#~ "Zeichen)."
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Der gewählte Weg enthält nicht den gewählten Knoten."
+#~ msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Knoten."
+
 #~ msgid ""
 #~ "Target object with id {0} and version {1} is visible although source "
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 22626)
+++ applications/editors/josm/i18n/po/el.po	(revision 22628)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
 "PO-Revision-Date: 2010-04-20 18:36+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -222,4 +222,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -231,4 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -238,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -293,5 +295,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Ακύρωση"
@@ -357,4 +359,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -413,5 +416,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1369,5 +1372,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1432,4 +1435,53 @@
 msgid "Preferences"
 msgstr "Προτιμήσεις"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Προετοιμασία..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "Συγχώνευση"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Ρύθμιση τοποθεσιών πρόσθετων"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "προσθήκη στην επιλογή"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1471,4 +1523,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1706,4 +1759,5 @@
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον μια διαδρομή προς απλοποίηση."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1711,4 +1765,5 @@
 #: ../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 "Ναι"
@@ -1758,8 +1813,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2931,4 +2985,5 @@
 
 #. 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
@@ -2958,5 +3013,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "Εντάξει"
@@ -3167,8 +3222,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.<br> Αυτό "
+"μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν βλέπετε) "
+"μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3199,10 +3258,5 @@
 msgstr[1] "Μετακίνηση {0} κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3212,4 +3266,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3588,5 +3648,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3596,6 +3656,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3605,10 +3665,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3616,5 +3678,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3623,5 +3685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3629,4 +3691,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3923,5 +3993,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "σιδηρόδρομος"
@@ -4191,69 +4261,69 @@
 msgstr "Κωδικός"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "χρήση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "Επιλογές"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Εμφάνιση αυτής της βοήθειας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Επιλογή με την δοθείσα αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Επιλογή γλώσσας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4263,9 +4333,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "παραδείγματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4275,45 +4345,45 @@
 "αυτή τη σειρά."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Αρχικοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Ενημέρωση πρόσθετων..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Εγκατάσταση ενημερωμένων πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Ρύθμιση προκαθορισμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Δημιουργία κύριου GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Φόρτωση πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4322,14 +4392,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Αρχείο"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4348,10 +4434,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Προβολή"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4359,5 +4445,5 @@
 msgstr "Εργαλεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4365,5 +4451,5 @@
 msgstr "Προεπιλογές"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4374,5 +4460,5 @@
 msgstr "Μενού: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Ήχος"
@@ -4474,12 +4560,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "κινέζικη"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Ηρώο"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5190,5 +5274,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "όλα"
@@ -5826,5 +5910,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Σχέσεις"
@@ -5918,10 +6002,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6523,4 +6607,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6982,5 +7068,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7024,111 +7109,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Όνομα"
@@ -8161,21 +8247,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "ελαχ. γ. πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "ελαχ. γ. μήκος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "μεγ. γ. πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "μεγ. γ. μήκος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8185,10 +8275,10 @@
 "για να κατεβάσετε μια περιοχή)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8197,15 +8287,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8353,8 +8443,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Τύπος"
@@ -8383,6 +8473,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "άγνωστο"
@@ -8765,7 +8855,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Εισάγετε το σχόλιο σας"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -8956,7 +9045,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9268,12 +9359,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Αντιστροφή"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Συνέχεια"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9299,7 +9388,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Να μην εμφανιστεί ξανά"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9482,5 +9570,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9661,5 +9749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Περιγραφή"
@@ -11291,5 +11379,5 @@
 msgstr "Χρώματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11300,35 +11388,35 @@
 msgstr "Όλα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Τοπικά αρχεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Κανένα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Σχεδιασμός μεγάλων σημείων GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Ταχύτητα (κόκκινο = αργό, πράσινο = γρήγορο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11336,5 +11424,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11356,5 +11444,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11396,5 +11484,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11408,64 +11496,70 @@
 msgstr "Πεζοί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Σχεδιασμός Βελών Κατεύθυνσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Γρήγορος σχεδιασμός (δείχνει άσχημος)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Σχεδιασμός αριθμών σειράς τμημάτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Σχεδιασμός εικονικών κόμβων σε κατάσταση επιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Εξομάλυνση γραφικών χάρτη (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Συγγραφέας"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Καράβι"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11473,9 +11567,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11483,9 +11577,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Μέγιστο μήκος για τοπικά αρχεία (μέτρα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11494,25 +11588,25 @@
 "σχεδιασμό όλων των γραμμών."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Μέγιστο μήκος (μέτρα)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Σχεδιασμός βελών κατεύθυνσης για γραμμές που συνδέουν σημεία GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11520,13 +11614,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Ελάχιστη απόσταση (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Σχεδιασμός μεγαλύτερων κουκίδων για τα σημεία GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11534,9 +11628,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Χρωματισμός σημείων και τμημάτων ιχνών ανάλογα με την ταχύτητα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11544,35 +11638,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Χρωματισμός Ιχνών και Σημείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Σημεία GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -11580,19 +11674,19 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Δεδομένα OSM"
@@ -11960,7 +12054,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Επίπεδο για την λήψη μετρήσεων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12802,5 +12895,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14372,5 +14465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14397,5 +14490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14640,5 +14733,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -15087,5 +15180,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Κτήρια"
@@ -15322,5 +15415,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17294,7 +17387,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "επιλυμένη έκδοση:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -17912,13 +18004,13 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Επεξεργασία Υποδηματοπωλείου"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Διαχωριστική γραμμή"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18997,5 +19089,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr ""
@@ -20956,5 +21048,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr ""
@@ -21493,5 +21585,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21504,5 +21596,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "άλσος"
@@ -21780,4 +21872,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21806,9 +21960,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "ναι"
@@ -21918,9 +22103,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "όχι"
@@ -22344,5 +22560,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "πεζοπορία"
@@ -22377,5 +22593,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22389,5 +22605,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22516,4 +22740,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22545,14 +22777,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Λειτουργός"
@@ -22814,12 +23050,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -23671,5 +23907,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Τάση ρεύματος"
@@ -23981,6 +24217,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24032,32 +24270,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
@@ -24066,4 +24304,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24116,174 +24355,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24313,7 +24552,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
@@ -24329,5 +24568,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "υπόγειο"
@@ -24340,6 +24579,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Κόστος"
@@ -24515,5 +24754,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Αναπηρικό καρότσι"
@@ -24550,6 +24789,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Καταφύγιο"
@@ -24557,5 +24796,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Παγκάκι"
@@ -24674,5 +24913,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Φάρος"
@@ -24732,11 +24971,241 @@
 msgstr "Επεξεργασία Ξενοδοχείου"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Αστέρια"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr ""
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Αριθμός Τηλεφώνου"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr ""
@@ -24744,20 +25213,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr ""
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Ξενώνας"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Επεξεργασία Ξενώνα"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Σαλέ"
@@ -24765,10 +25234,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Επεξεργασία Σαλέ"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr ""
@@ -24776,30 +25245,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr ""
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Χώρος Τροχόσπιτων"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Επεξεργασία Χώρου Τροχόσπιτων"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Χώρος Κάμπινγκ"
@@ -24807,10 +25276,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Επεξεργασία Χώρου Κάμπινγκ"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Φαγητό+Ποτά"
@@ -24821,5 +25290,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Εστιατόριο"
@@ -24827,11 +25296,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Επεξεργασία Εστιατορίου"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Κουζίνα"
@@ -24839,78 +25308,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "ιταλική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "κινέζικη"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "ελληνική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "γερμανική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "ινδική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "τοπική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "τουρκική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "ασιατική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "ταϊλανδέζικη"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "μεξικάνικη"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "ιαπωνική"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -24918,17 +25388,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Καφέ"
@@ -24936,9 +25418,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Επεξεργασία Καφέ"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -24946,19 +25429,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Επεξεργασία Pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Μπυραρία"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Επεξεργασία Μπυραρίας"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Μπαρ"
@@ -24966,9 +25450,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Επεξεργασία Μπαρ"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Νυχτερινό Κέντρο"
@@ -24976,24 +25461,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Νυχτερινό Κέντρο"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Τουρισμός"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Μουσείο"
@@ -25001,9 +25487,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Επεξεργασία Μουσείου"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Ζωολογικός Κήπος"
@@ -25012,9 +25498,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Επεξεργασία Ζωολογικού Κήπου"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr ""
@@ -25022,24 +25508,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Πύργος Παρατήρησης"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Θεματικό Πάρκο"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Επεξεργασία Θεματικού Πάρκου"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr ""
@@ -25047,5 +25533,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr ""
@@ -25053,19 +25539,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Χάρτης"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25103,5 +25589,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25109,28 +25595,28 @@
 msgstr "οδός"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25140,5 +25626,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25146,5 +25632,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Πεζοπορία"
@@ -25152,6 +25638,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Ποδηλασία"
@@ -25159,5 +25645,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25165,6 +25651,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr ""
@@ -25172,5 +25658,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25178,46 +25664,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "ιστορία"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25226,5 +25712,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25232,29 +25718,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr ""
@@ -25262,25 +25748,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Τζάκι"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Ιστορικά Σημεία"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Κάστρο"
@@ -25289,19 +25775,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Επεξεργασία Κάστρου"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ερείπια"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Επεξεργασία Ερειπίων"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Αρχαιολογικός Χώρος"
@@ -25310,9 +25796,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Πεδίο Μάχης"
@@ -25320,10 +25806,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Επεξεργασία Πεδίου Μάχης"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25331,5 +25817,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25337,15 +25823,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -25353,55 +25839,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -25409,35 +25895,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Ψάρεμα"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Επεξεργασία Ψαρέματος"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Αθλητικά"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -25451,6 +25937,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -25866,6 +26352,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -25900,240 +26386,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "τοξοβολία"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "Καλαθοσφαίρηση"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "Κανόε"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "αναρρήχηση"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "ποδηλασία"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "κυνοδρομίες"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "σκοποβολή"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "κολύμβηση"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "επιτραπέζια αντισφαίρηση"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "αντισφαίρηση"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26175,23 +26661,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "τύπος"
@@ -26233,211 +26719,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "αθλητικό κέντρο"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "στάδιο"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Μηχανοκίνητα Αθλήματα"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
@@ -26445,52 +26931,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "εύκολη"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -26498,204 +26984,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Κτήριο"
@@ -26703,5 +27189,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -26709,10 +27195,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -26720,10 +27206,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -26731,10 +27217,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -26743,10 +27229,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Φυλακή"
@@ -26755,10 +27241,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Αστυνομία"
@@ -26768,10 +27254,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -26780,10 +27266,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -26791,5 +27277,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -26797,15 +27283,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Νηπιαγωγείο"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγείου"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Σχολείο"
@@ -26813,10 +27299,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -26824,10 +27310,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Κολέγιο"
@@ -26835,5 +27321,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -26841,5 +27327,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -26848,10 +27334,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -26860,9 +27346,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -26870,10 +27356,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -26882,10 +27368,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -26895,5 +27381,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -26902,6 +27388,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -26910,66 +27396,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -26978,81 +27464,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Διευθύνσεις"
@@ -27061,5 +27547,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -27067,5 +27553,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -27073,25 +27559,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Όνομα οδού"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -27100,5 +27586,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -27106,61 +27592,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Τρόπος Αρίθμησης"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "Μονά"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27168,25 +27654,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -27194,10 +27680,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -27205,10 +27691,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -27217,41 +27703,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "Αέριο"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Θέση"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -27261,10 +27747,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Γερανός"
@@ -27272,5 +27758,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
@@ -27278,10 +27764,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr ""
@@ -27289,10 +27775,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -27300,23 +27786,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -27326,35 +27812,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -27363,10 +27849,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -27375,5 +27861,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -27381,10 +27867,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Πυλώνας Ρεύματος"
@@ -27395,23 +27881,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -27420,20 +27906,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27441,55 +27927,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "μονή"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "διπλή"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "τριπλή"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "τετραπλή"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Τουαλέτες"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -27498,5 +27984,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -27504,5 +27990,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Κέρματα"
@@ -27510,5 +27996,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -27516,5 +28002,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27522,5 +28008,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -27528,15 +28014,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -27545,5 +28031,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -27551,35 +28037,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27587,5 +28073,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27594,31 +28080,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Υλικό"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "πέτρα"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "πλαστικό"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Χρώμα"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "μαύρο"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "καφέ"
@@ -27697,5 +28183,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27705,31 +28191,31 @@
 msgstr "πράσινο"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "κόκκινο"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "μπλε"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "γκρι"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "λευκό"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Σύνολο Καθισμάτων"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27738,30 +28224,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Κρυψώνα"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Κλειδαριά"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -27770,10 +28256,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -27782,10 +28268,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27794,5 +28280,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27800,5 +28286,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -27806,15 +28292,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Καταστήματα"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27822,10 +28308,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Επεξεργασία Καταστήματος"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27834,28 +28320,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Επεξεργασία Supermarket"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr ""
@@ -27863,9 +28349,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Περίπτερο"
@@ -27873,27 +28359,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Επεξεργασία Περιπτέρου"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Ταξιδιωτικό Γραφείο"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Επεξεργασία Ταξιδιωτικού Γραφείου"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Κρεοπωλείο"
@@ -27901,9 +28387,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Επεξεργασία Κρεοπωλείου"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Φούρνος"
@@ -27911,9 +28397,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Επεξεργασία Φούρνου"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Ανθοπωλείο"
@@ -27921,18 +28407,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Επεξεργασία Ανθοπωλείου"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Βιολογικά"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Επεξεργασία Καταστήματος Βιολογικών"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Κάβα Ποτών"
@@ -27940,54 +28426,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Επεξεργασία Κάβας Ποτών"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Ποτά"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Υπολογιστές"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Ηλεκτρονικά"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Ηχοσυστήματα"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Έπιπλα"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Επεξεργασία Καταστήματος Επίπλων"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Είδη Κήπου"
@@ -27995,9 +28481,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Σιδηρικά"
@@ -28005,9 +28491,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -28015,54 +28501,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Χαρτικά"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Επεξεργασία Χαρτοπωλείου"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Κομμωτήριο"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Επεξεργασία Κομμωτηρίου"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Υποδήματα"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Επεξεργασία Υποδηματοπωλείου"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Παιχνίδια"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Στεγνοκαθαριστήριο"
@@ -28070,9 +28556,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Πλυντήριο"
@@ -28080,9 +28566,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Επεξεργασία πλυντηρίου"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr ""
@@ -28090,24 +28576,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Επεξεργασία Καταστήματος Αθλητικών"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Οπτικός"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Επεξεργασία Οπτικού"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -28115,5 +28601,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Επεξεργασία Μηχανήματος Πώλησης"
@@ -28121,97 +28607,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Πωλούμενα Προϊόντα"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "κουπόνια"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "Προφυλακτικά"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -28219,14 +28705,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Επεξεργασία Τράπεζας"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -28234,5 +28720,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Επεξεργασία Συναλλακτηρίου"
@@ -28240,15 +28726,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -28256,18 +28742,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Επεξεργασία Ιατρών"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -28275,5 +28761,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Επεξεργασία Φαρμακείου"
@@ -28281,9 +28767,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -28291,10 +28777,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr ""
@@ -28303,5 +28789,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28310,20 +28796,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Αριθμός Τηλεφώνου"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -28331,5 +28812,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -28338,64 +28819,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Γεωγραφία"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Τοποθεσίες"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Χώρα"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Πολιτεία"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
@@ -28403,15 +28884,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Πόλη"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -28419,10 +28900,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -28430,25 +28911,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Χωριό"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Οικισμός"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Επεξεργασία Οικισμού"
@@ -28456,5 +28937,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Τοπονύμιο/Περιοχή"
@@ -28462,10 +28943,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Επεξεργασία Τοπονυμίου/Περιοχής"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Νησί"
@@ -28473,10 +28954,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Νησίδα"
@@ -28484,5 +28965,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Επεξεργασία Νησίδας"
@@ -28490,5 +28971,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -28496,10 +28977,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Κορυφή"
@@ -28507,10 +28988,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Επεξεργασία κορυφής"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -28518,10 +28999,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Επεξεργασία παγετώνα"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -28529,70 +29010,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Επεξεργασία ηφαιστείου"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Εθνικό"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Αστικό"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Αστικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Πολιτικό"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Εθνικό πάρκο"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Δένδρο"
@@ -28601,15 +29082,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Άλσος"
@@ -28618,5 +29099,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Επεξεργασία άλσους"
@@ -28624,17 +29105,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "Κωνοφόρο"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Δάσος"
@@ -28643,14 +29124,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Εθνικός Δρυμός"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Επεξεργασία Εθνικού Δρυμού"
@@ -28658,25 +29139,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -28684,10 +29165,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr ""
@@ -28695,5 +29176,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr ""
@@ -28701,5 +29182,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr ""
@@ -28708,45 +29189,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Λειβάδι"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Επεξεργασία Λειβαδιού"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28754,25 +29235,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -28780,10 +29261,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr ""
@@ -28791,20 +29272,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -28812,5 +29293,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -28818,15 +29299,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -28834,9 +29315,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -28844,39 +29325,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr ""
@@ -28884,15 +29365,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28900,50 +29381,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
@@ -28953,5 +29434,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28963,5 +29444,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "εξωτερικός τομέας"
@@ -28969,5 +29450,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "εσωτερικός τομέας"
@@ -28975,5 +29456,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -28984,5 +29465,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -28990,36 +29471,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29027,5 +29508,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -29034,5 +29515,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -29040,34 +29521,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -29076,15 +29557,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr ""
@@ -29092,5 +29573,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Διαδρομή"
@@ -29099,5 +29580,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -29105,5 +29586,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
@@ -29211,5 +29692,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29220,17 +29701,17 @@
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "Πορθμείο"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "σκι"
@@ -29298,5 +29779,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29306,9 +29787,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "παράκαμψη"
@@ -29322,10 +29803,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -29333,31 +29814,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -29366,30 +29847,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30567,16 +31048,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr ""
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33495,13 +33964,4 @@
 msgstr ""
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Η επιλεγμένη διαδρομή δεν περιέχει τον επιλεγμένο κόμβο."
-#~ msgstr[1] ""
-#~ "Η επιλεγμένη διαδρομή δεν περιέχει όλους τους επιλεγμένους κόμβους."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -33510,7 +33970,4 @@
 #~ "Το πρόσθετο δεν μπορεί να αφαιρεθεί. Παρακαλώ πείτε στα άτομα από τα "
 #~ "οποία πήρατε το JOSM για το πρόβλημα."
-
-#~ msgid "Preparing..."
-#~ msgstr "Προετοιμασία..."
 
 #~ msgid "Uploading..."
@@ -33723,4 +34180,7 @@
 #~ "Μη κάνετε αποστολή δεδομένων μετά από αυτό το μήνυμα."
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Μοίρες Λεπτά Δεύτερα Λεπτα"
+
 #~ msgid ""
 #~ "Internal Error: cannot check conditions for no layer. Please report this "
@@ -33874,14 +34334,4 @@
 #~ msgid "true"
 #~ msgstr "αληθές"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Πρόκειτε να διαγράψετε κόμβους εκτός της περιοχής που λάβατε.<br> Αυτό "
-#~ "μπορεί να δημιουργήσει προβλήματα γιατί άλλα αντικείμενα (που δεν "
-#~ "βλέπετε) μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε "
-#~ "διαγραφή;"
 
 #~ msgid "Email"
@@ -34215,7 +34665,4 @@
 #~ msgstr "Άνοιγμα εικόνων  με το AgPifoJ..."
 
-#~ msgid "Continue anyway"
-#~ msgstr "Συνέχεια έτσι κι αλλιώς"
-
 #~ msgid "Sorry, doesn't work with anonymous users"
 #~ msgstr "Συγνώμη, δεν δουλεύει για ανόνυμους χρήστες"
@@ -34245,4 +34692,10 @@
 #~ msgstr "δεν βρέθηκε προγενέστερη έκδοση. Ιστορικό κενό."
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Η επιλεγμένη διαδρομή δεν περιέχει τον επιλεγμένο κόμβο."
+#~ msgstr[1] ""
+#~ "Η επιλεγμένη διαδρομή δεν περιέχει όλους τους επιλεγμένους κόμβους."
+
 #~ msgid "More than one \"to\" way found."
 #~ msgstr "Βρέθηκαν περισότερες απο μία διαδρομή \"προς\""
Index: applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- applications/editors/josm/i18n/po/en_AU.po	(revision 22626)
+++ applications/editors/josm/i18n/po/en_AU.po	(revision 22628)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
 "PO-Revision-Date: 2010-06-15 17:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -228,4 +228,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -237,4 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -299,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Cancel"
@@ -365,4 +367,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -421,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1385,5 +1388,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1451,4 +1454,53 @@
 msgid "Preferences"
 msgstr "Preferences"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Surveyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "burger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Configure Plug-in Sites"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "add to selection"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1490,4 +1542,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1726,4 +1779,5 @@
 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
@@ -1731,4 +1785,5 @@
 #: ../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"
@@ -1778,8 +1833,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "The current selection cannot be used for splitting."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2984,4 +3038,5 @@
 
 #. 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
@@ -3011,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3225,8 +3280,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3257,10 +3316,5 @@
 msgstr[1] "Move {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Purged object ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3270,4 +3324,10 @@
 msgstr[1] "Purged {0} objects"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Purged object ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3674,5 +3734,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3685,6 +3745,6 @@
 "error, it should be safe to continue in your work."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3694,10 +3754,12 @@
 msgstr "Missing merge target for way with id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Missing merge target for object with id {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3705,5 +3767,5 @@
 msgstr "Missing merge target for node with id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3712,5 +3774,5 @@
 msgstr "Missing merge target for relation with id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3719,4 +3781,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Missing merge target of type {0} with id {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4022,5 +4092,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "railway"
@@ -4294,69 +4364,69 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4370,9 +4440,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4382,45 +4452,45 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4429,14 +4499,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Preference setting {0} has been removed since it is no longer used."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "File"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4455,10 +4541,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "View"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4466,5 +4552,5 @@
 msgstr "Tools"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4472,5 +4558,5 @@
 msgstr "Presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4481,5 +4567,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4579,17 +4665,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Numeric"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "chinese"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Commercial"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5333,5 +5416,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "all"
@@ -5991,5 +6074,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relations"
@@ -6083,10 +6166,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -6696,4 +6779,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7155,5 +7240,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7197,111 +7281,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Name"
@@ -8398,21 +8483,25 @@
 msgstr "Rename the currently selected bookmark"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8422,10 +8511,10 @@
 "area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Bounding Box"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8434,15 +8523,15 @@
 msgstr "The string ''{0}'' is not a valid double value."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Value for latitude in range [-90,90] required."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Value for longitude in range [-180,180] required."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8591,8 +8680,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Type"
@@ -8621,6 +8710,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "unknown"
@@ -9043,7 +9132,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Illegal upload comment"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9250,7 +9338,9 @@
 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"
@@ -9577,17 +9667,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Illegal upload comment"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Reverse"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Continue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9605,7 +9692,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Click to return to the Upload Dialogue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9822,5 +9908,5 @@
 msgstr[1] "Uploading {0} objects..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10012,5 +10098,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Description"
@@ -11761,5 +11847,5 @@
 msgstr "Colours"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11770,35 +11856,35 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Local files"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "None"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Draw large GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Draw a circle form HDOP value."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocity (red = slow, green = fast)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -11806,5 +11892,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11826,5 +11912,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11866,5 +11952,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11878,65 +11964,70 @@
 msgstr "Foot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Only interesting direction hints (e.g. with oneway tag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Draw virtual nodes in select mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Draw inactive layers in other colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Smooth map graphics (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Author"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "North"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11946,9 +12037,9 @@
 "layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11958,9 +12049,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (metres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11968,10 +12059,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11979,10 +12070,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11990,5 +12081,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11998,13 +12089,13 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12014,9 +12105,9 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12026,55 +12117,54 @@
 "capture device needs to log that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track colouring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Waypoint Description"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -12473,7 +12563,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Layer to make measurements"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13372,5 +13461,5 @@
 msgstr "Parsing response from server..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -15083,5 +15172,5 @@
 "<br><br>The error message is:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15112,5 +15201,5 @@
 "problem. JOSM will stop working."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15372,5 +15461,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15819,5 +15908,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Buildings"
@@ -16067,5 +16156,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -18075,7 +18164,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "Merged version"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18697,13 +18785,13 @@
 msgstr "Terrace"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Edit Shoe Shop"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Separator"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19786,5 +19874,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21822,5 +21910,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Reference"
@@ -22359,5 +22447,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "metal"
@@ -22370,5 +22458,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "wood"
@@ -22646,4 +22734,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22672,9 +22822,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "yes"
@@ -22784,9 +22965,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "no"
@@ -23210,5 +23422,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "hiking"
@@ -23243,5 +23455,5 @@
 msgstr "good"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "intermediate"
@@ -23255,5 +23467,13 @@
 msgstr "horrible"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Wheelchairs"
@@ -23382,4 +23602,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23411,14 +23639,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operator"
@@ -23680,12 +23912,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Elevation"
@@ -24537,5 +24769,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Voltage"
@@ -24847,6 +25079,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24898,32 +25132,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -24932,4 +25166,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24982,174 +25217,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Fuel types:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 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:1347
+#: build/trans_presets.java:1348
 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:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "Octane 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "Octane 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "Octane 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "Octane 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Compressed Natural Gas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 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:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25179,7 +25415,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Reference number"
@@ -25195,5 +25431,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "underground"
@@ -25206,6 +25442,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Fee"
@@ -25381,5 +25617,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -25416,6 +25652,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Shelter"
@@ -25423,5 +25659,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Bench"
@@ -25540,5 +25776,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Beacon"
@@ -25598,11 +25834,241 @@
 msgstr "Edit Hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Phone Number"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -25610,20 +26076,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Chalet"
@@ -25631,10 +26097,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Hostel"
@@ -25642,30 +26108,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -25673,10 +26139,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -25687,5 +26153,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -25693,11 +26159,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -25705,78 +26171,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25784,17 +26251,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "chicken"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Cafe"
@@ -25802,9 +26281,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -25812,19 +26292,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -25832,9 +26313,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -25842,24 +26324,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museum"
@@ -25867,9 +26350,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -25878,9 +26361,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -25888,24 +26371,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Artwork"
@@ -25913,5 +26396,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -25919,19 +26402,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topo"
@@ -25969,5 +26452,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25975,28 +26458,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -26006,5 +26489,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -26012,5 +26495,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Hiking"
@@ -26018,6 +26501,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Cycling"
@@ -26025,5 +26508,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -26031,6 +26514,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Skiing"
@@ -26038,5 +26521,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Riding"
@@ -26044,54 +26527,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "pole"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -26099,29 +26581,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -26129,25 +26611,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Castle"
@@ -26156,19 +26638,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -26177,9 +26659,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -26187,10 +26669,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -26198,5 +26680,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -26204,15 +26686,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Memorial"
@@ -26220,55 +26702,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Playground"
@@ -26276,35 +26758,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -26318,6 +26800,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "select sport:"
@@ -26733,6 +27215,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26767,240 +27249,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -27042,23 +27524,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "type"
@@ -27100,211 +27582,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -27312,52 +27794,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Shooting"
@@ -27365,204 +27847,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Building"
@@ -27570,5 +28052,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Public Building"
@@ -27576,10 +28058,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Town hall"
@@ -27587,10 +28069,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Embassy"
@@ -27598,10 +28080,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -27610,10 +28092,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Prison"
@@ -27622,10 +28104,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Police"
@@ -27635,10 +28117,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -27647,10 +28129,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Post Office"
@@ -27658,5 +28140,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -27664,15 +28146,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "School"
@@ -27680,10 +28162,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "University"
@@ -27691,10 +28173,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "College"
@@ -27702,5 +28184,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Edit College"
@@ -27708,5 +28190,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Cinema"
@@ -27715,10 +28197,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Library"
@@ -27727,9 +28209,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -27737,10 +28219,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Theatre"
@@ -27749,10 +28231,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -27762,5 +28244,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -27769,6 +28251,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religion"
@@ -27777,66 +28259,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Denomination"
@@ -27845,81 +28327,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Addresses"
@@ -27928,5 +28410,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -27934,5 +28416,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "House number"
@@ -27940,25 +28422,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "House name"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Street name"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "City name"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Country code"
@@ -27967,5 +28449,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -27973,61 +28455,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -28035,25 +28517,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -28061,10 +28543,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Windmill"
@@ -28072,10 +28554,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -28084,41 +28566,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -28128,10 +28610,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Crane"
@@ -28139,5 +28621,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -28145,10 +28627,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -28156,10 +28638,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -28167,23 +28649,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -28193,35 +28675,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Power Station"
@@ -28230,10 +28712,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -28242,5 +28724,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -28248,10 +28730,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -28262,23 +28744,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Power Line"
@@ -28287,20 +28769,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28308,55 +28790,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 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:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telephone"
@@ -28365,5 +28847,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -28371,5 +28853,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Coins"
@@ -28377,5 +28859,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Notes"
@@ -28383,5 +28865,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -28389,5 +28871,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -28395,15 +28877,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Recycling"
@@ -28412,5 +28894,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -28418,35 +28900,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -28454,5 +28936,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -28461,31 +28943,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "brown"
@@ -28564,5 +29046,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28572,31 +29054,31 @@
 msgstr "green"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -28605,30 +29087,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fountain"
@@ -28637,10 +29119,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -28649,10 +29131,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -28661,5 +29143,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -28667,5 +29149,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -28673,15 +29155,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Car Dealer"
@@ -28689,10 +29171,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Bike Dealer"
@@ -28701,28 +29183,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Chemist"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Edit Chemist"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -28730,9 +29212,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -28740,27 +29222,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Book Store"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Edit Book Store"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Travel Agency"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Edit Travel Agency"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Butcher"
@@ -28768,9 +29250,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Baker"
@@ -28778,9 +29260,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Florist"
@@ -28788,18 +29270,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Organic"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -28807,54 +29289,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -28862,9 +29344,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Hardware"
@@ -28872,9 +29354,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -28882,54 +29364,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Toys"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -28937,9 +29419,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Laundry"
@@ -28947,9 +29429,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -28957,24 +29439,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optician"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -28982,5 +29464,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -28988,97 +29470,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Bank"
@@ -29086,14 +29568,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -29101,5 +29583,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -29107,15 +29589,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Doctors"
@@ -29123,18 +29605,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -29142,5 +29624,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -29148,9 +29630,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Hospital"
@@ -29158,10 +29640,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -29170,5 +29652,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -29177,20 +29659,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Point Name"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Phone Number"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -29198,5 +29675,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -29205,64 +29682,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Places"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Country"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "State"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "County"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Edit County"
@@ -29270,15 +29747,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "City"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Town"
@@ -29286,10 +29763,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Suburb"
@@ -29297,25 +29774,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -29323,5 +29800,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Locality"
@@ -29329,10 +29806,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Island"
@@ -29340,10 +29817,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Islet"
@@ -29351,5 +29828,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Edit Islet"
@@ -29357,5 +29834,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -29363,10 +29840,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Peak"
@@ -29374,10 +29851,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Glacier"
@@ -29385,10 +29862,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Volcano"
@@ -29396,70 +29873,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Political"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "National park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Tree"
@@ -29468,15 +29945,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Wood"
@@ -29485,5 +29962,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -29491,17 +29968,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Forest"
@@ -29510,14 +29987,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -29525,25 +30002,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Fell"
@@ -29551,10 +30028,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Heath"
@@ -29562,5 +30039,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -29568,5 +30045,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -29575,45 +30052,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -29621,25 +30098,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Village Green"
@@ -29647,10 +30124,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Common"
@@ -29658,20 +30135,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -29679,5 +30156,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -29685,15 +30162,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -29701,9 +30178,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -29711,39 +30188,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Railway land"
@@ -29751,15 +30228,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -29767,50 +30244,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
@@ -29820,5 +30297,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -29830,5 +30307,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "outer segment"
@@ -29836,5 +30313,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "inner segment"
@@ -29842,5 +30319,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29851,5 +30328,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29857,36 +30334,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29894,5 +30371,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -29901,5 +30378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -29907,34 +30384,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -29943,15 +30420,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "to way"
@@ -29959,5 +30436,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Route"
@@ -29966,5 +30443,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -29972,5 +30449,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Route type"
@@ -30078,5 +30555,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30087,17 +30564,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ski"
@@ -30165,5 +30642,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30173,9 +30650,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "detour"
@@ -30189,10 +30666,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -30200,31 +30677,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -30233,30 +30710,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -31434,16 +31911,4 @@
 msgstr "aeroway"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34367,14 +34832,4 @@
 #~ msgstr[1] "The selected way does not contain all the selected nodes."
 
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Degrees Minutes Seconds"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Enter an upload comment (min. 3 characters)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Please enter a comment for this upload changeset (min. 3 characters)"
-
 #~ msgid ""
 #~ "<html>There are {0} primitives in your local dataset which<br>might be "
@@ -34399,4 +34854,10 @@
 #~ msgstr "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Degrees Minutes Seconds"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Missing merge target for object with id {0}"
+
 #~ msgid ""
 #~ "Target object with id {0} and version {1} is visible although source "
@@ -34565,4 +35026,11 @@
 #~ msgid "Apply also for children"
 #~ msgstr "Apply also for children"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Enter an upload comment (min. 3 characters)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Please enter a comment for this upload changeset (min. 3 characters)"
 
 #~ msgid "Uploading {0} objects ..."
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 22626)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 22628)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"POT-Creation-Date: 2010-08-13 23:23+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-04 17:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -28,6 +28,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -123,6 +123,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -231,4 +231,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -240,4 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -302,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Cancel"
@@ -368,4 +370,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -424,5 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1388,5 +1391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1454,4 +1457,53 @@
 msgid "Preferences"
 msgstr "Preferences"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Surveyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "burger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Confirmation"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "add to selection"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1493,4 +1545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1729,4 +1782,5 @@
 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
@@ -1734,4 +1788,5 @@
 #: ../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"
@@ -1781,8 +1836,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "The current selection cannot be used for splitting."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2987,4 +3041,5 @@
 
 #. 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
@@ -3014,5 +3069,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3228,8 +3283,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects, that you don't see, might "
+"be using them.<br>Do you really want to delete?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3260,10 +3319,5 @@
 msgstr[1] "Move {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Purged object ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3273,4 +3327,10 @@
 msgstr[1] "Purged {0} objects"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Purged object ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3677,5 +3737,5 @@
 "Unable to add primitive {0} to the dataset because it is already included"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3688,6 +3748,6 @@
 "error, it should be safe to continue in your work."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3697,10 +3757,12 @@
 msgstr "Missing merge target for way with id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Missing merge target for object with id {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3708,5 +3770,5 @@
 msgstr "Missing merge target for node with id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3715,5 +3777,5 @@
 msgstr "Missing merge target for relation with id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3722,4 +3784,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Missing merge target of type {0} with id {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4025,5 +4095,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "railway"
@@ -4297,69 +4367,69 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4373,9 +4443,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4385,45 +4455,45 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4432,14 +4502,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Preference setting {0} has been removed since it is no longer used."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "File"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4458,10 +4544,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "View"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4469,5 +4555,5 @@
 msgstr "Tools"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4475,5 +4561,5 @@
 msgstr "Presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4484,5 +4570,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4582,17 +4668,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Numeric"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "chinese"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Commercial"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5336,5 +5419,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "all"
@@ -5994,5 +6077,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relations"
@@ -6086,10 +6169,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -6699,4 +6782,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7158,5 +7243,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7200,111 +7284,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Name"
@@ -8409,21 +8494,25 @@
 msgstr "Rename the currently selected bookmark"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8433,10 +8522,10 @@
 "area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Bounding Box"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8445,15 +8534,15 @@
 msgstr "The string ''{0}'' is not a valid double value."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Value for latitude in range [-90,90] required."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Value for longitude in range [-180,180] required."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8602,8 +8691,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Type"
@@ -8632,6 +8721,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "unknown"
@@ -9054,7 +9143,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Illegal upload comment"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9261,7 +9349,9 @@
 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"
@@ -9588,17 +9678,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Illegal upload comment"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Reverse"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Continue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9616,7 +9703,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Cancel and return to editor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9625,7 +9711,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Do not show again"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9834,5 +9919,5 @@
 msgstr[1] "Uploading {0} objects..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10024,5 +10109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Description"
@@ -11775,5 +11860,5 @@
 msgstr "Colours"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11784,35 +11869,35 @@
 msgstr "All"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Local files"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "None"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Force lines if no segments imported."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Draw large GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Draw a circle form HDOP value."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocity (red = slow, green = fast)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -11820,5 +11905,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11840,5 +11925,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11880,5 +11965,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11892,65 +11977,70 @@
 msgstr "Foot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Only interesting direction hints (e.g. with oneway tag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Draw virtual nodes in select mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Draw inactive layers in other colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Smooth map graphics (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Author"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Boat"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11960,9 +12050,9 @@
 "layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11972,9 +12062,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (metres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11982,10 +12072,10 @@
 "Maximum length (in metres) to draw lines. Set to ''-1'' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11993,10 +12083,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12004,5 +12094,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12012,13 +12102,13 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12028,9 +12118,9 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12040,55 +12130,54 @@
 "capture device needs to log that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track colouring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Waypoint Description"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -12487,7 +12576,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Layer to make measurements"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13386,5 +13474,5 @@
 msgstr "Parsing response from server..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -15105,5 +15193,5 @@
 "<br><br>The error message is:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15134,5 +15222,5 @@
 "problem. JOSM will stop working."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15394,5 +15482,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15841,5 +15929,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Buildings"
@@ -16091,5 +16179,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -18099,7 +18187,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "resolved version:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18721,13 +18808,13 @@
 msgstr "Terrace"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Edit Shoe Shop"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Separator"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19830,5 +19917,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21868,5 +21955,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Reference"
@@ -22405,5 +22492,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "metal"
@@ -22416,5 +22503,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "wood"
@@ -22692,4 +22779,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22718,9 +22867,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "yes"
@@ -22830,9 +23010,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "no"
@@ -23256,5 +23467,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "hiking"
@@ -23289,5 +23500,5 @@
 msgstr "good"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "intermediate"
@@ -23301,5 +23512,13 @@
 msgstr "horrible"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Wheelchairs"
@@ -23428,4 +23647,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23457,14 +23684,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operator"
@@ -23726,12 +23957,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Elevation"
@@ -24583,5 +24814,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Voltage"
@@ -24893,6 +25124,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24944,32 +25177,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -24978,4 +25211,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -25028,174 +25262,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Fuel types:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 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:1347
+#: build/trans_presets.java:1348
 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:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "Octane 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "Octane 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "Octane 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "Octane 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Compressed Natural Gas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 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:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25225,7 +25460,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Reference number"
@@ -25241,5 +25476,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "underground"
@@ -25252,6 +25487,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Fee"
@@ -25427,5 +25662,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -25462,6 +25697,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Shelter"
@@ -25469,5 +25704,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Bench"
@@ -25586,5 +25821,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Beacon"
@@ -25644,11 +25879,241 @@
 msgstr "Edit Hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Phone Number"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -25656,20 +26121,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Chalet"
@@ -25677,10 +26142,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Hostel"
@@ -25688,30 +26153,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -25719,10 +26184,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -25733,5 +26198,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -25739,11 +26204,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -25751,78 +26216,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25830,17 +26296,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "chicken"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Cafe"
@@ -25848,9 +26326,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -25858,19 +26337,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -25878,9 +26358,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -25888,24 +26369,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museum"
@@ -25913,9 +26395,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -25924,9 +26406,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -25934,24 +26416,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Artwork"
@@ -25959,5 +26441,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -25965,19 +26447,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topo"
@@ -26015,5 +26497,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26021,28 +26503,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -26052,5 +26534,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -26058,5 +26540,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Hiking"
@@ -26064,6 +26546,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Cycling"
@@ -26071,5 +26553,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -26077,6 +26559,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Skiing"
@@ -26084,5 +26566,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Riding"
@@ -26090,54 +26572,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "pole"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -26145,29 +26626,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -26175,25 +26656,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Castle"
@@ -26202,19 +26683,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -26223,9 +26704,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -26233,10 +26714,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -26244,5 +26725,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -26250,15 +26731,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Memorial"
@@ -26266,55 +26747,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Playground"
@@ -26322,35 +26803,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -26364,6 +26845,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "select sport:"
@@ -26779,6 +27260,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26813,240 +27294,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -27088,23 +27569,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "type"
@@ -27146,211 +27627,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -27358,52 +27839,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Shooting"
@@ -27411,204 +27892,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Building"
@@ -27616,5 +28097,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Public Building"
@@ -27622,10 +28103,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Town hall"
@@ -27633,10 +28114,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Embassy"
@@ -27644,10 +28125,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -27656,10 +28137,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Prison"
@@ -27668,10 +28149,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Police"
@@ -27681,10 +28162,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -27693,10 +28174,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Post Office"
@@ -27704,5 +28185,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -27710,15 +28191,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "School"
@@ -27726,10 +28207,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "University"
@@ -27737,10 +28218,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "College"
@@ -27748,5 +28229,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Edit College"
@@ -27754,5 +28235,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Cinema"
@@ -27761,10 +28242,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Library"
@@ -27773,9 +28254,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -27783,10 +28264,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Theatre"
@@ -27795,10 +28276,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -27808,5 +28289,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -27815,6 +28296,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religion"
@@ -27823,66 +28304,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Denomination"
@@ -27891,81 +28372,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Addresses"
@@ -27974,5 +28455,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -27980,5 +28461,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "House number"
@@ -27986,25 +28467,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "House name"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Street name"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "City name"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Country code"
@@ -28013,5 +28494,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -28019,61 +28500,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -28081,25 +28562,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -28107,10 +28588,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Windmill"
@@ -28118,10 +28599,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -28130,41 +28611,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -28174,10 +28655,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Crane"
@@ -28185,5 +28666,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -28191,10 +28672,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -28202,10 +28683,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -28213,23 +28694,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -28239,35 +28720,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Power Station"
@@ -28276,10 +28757,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -28288,5 +28769,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -28294,10 +28775,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -28308,23 +28789,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Power Line"
@@ -28333,20 +28814,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28354,55 +28835,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 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:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telephone"
@@ -28411,5 +28892,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -28417,5 +28898,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Coins"
@@ -28423,5 +28904,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Notes"
@@ -28429,5 +28910,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -28435,5 +28916,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -28441,15 +28922,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Recycling"
@@ -28458,5 +28939,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -28464,35 +28945,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -28500,5 +28981,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -28507,31 +28988,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "brown"
@@ -28610,5 +29091,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28618,31 +29099,31 @@
 msgstr "green"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -28651,30 +29132,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fountain"
@@ -28683,10 +29164,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -28695,10 +29176,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -28707,5 +29188,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -28713,5 +29194,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -28719,15 +29200,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Car Dealer"
@@ -28735,10 +29216,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Bike Dealer"
@@ -28747,28 +29228,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Chemist"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Edit Chemist"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -28776,9 +29257,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -28786,27 +29267,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Book Store"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Edit Book Store"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Travel Agency"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Edit Travel Agency"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Butcher"
@@ -28814,9 +29295,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Baker"
@@ -28824,9 +29305,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Florist"
@@ -28834,18 +29315,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Organic"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -28853,54 +29334,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -28908,9 +29389,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Hardware"
@@ -28918,9 +29399,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -28928,54 +29409,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Toys"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -28983,9 +29464,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Laundry"
@@ -28993,9 +29474,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -29003,24 +29484,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optician"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -29028,5 +29509,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -29034,97 +29515,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Bank"
@@ -29132,14 +29613,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -29147,5 +29628,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -29153,15 +29634,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Doctors"
@@ -29169,18 +29650,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -29188,5 +29669,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -29194,9 +29675,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Hospital"
@@ -29204,10 +29685,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -29216,5 +29697,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -29223,20 +29704,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Point Name"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Phone Number"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -29244,5 +29720,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -29251,64 +29727,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Places"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Country"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "State"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "County"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Edit County"
@@ -29316,15 +29792,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "City"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Town"
@@ -29332,10 +29808,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Suburb"
@@ -29343,25 +29819,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -29369,5 +29845,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Locality"
@@ -29375,10 +29851,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Island"
@@ -29386,10 +29862,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Islet"
@@ -29397,5 +29873,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Edit Islet"
@@ -29403,5 +29879,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -29409,10 +29885,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Peak"
@@ -29420,10 +29896,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Glacier"
@@ -29431,10 +29907,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Volcano"
@@ -29442,70 +29918,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Political"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "National park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Tree"
@@ -29514,15 +29990,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Wood"
@@ -29531,5 +30007,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -29537,17 +30013,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Forest"
@@ -29556,14 +30032,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -29571,25 +30047,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Fell"
@@ -29597,10 +30073,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Heath"
@@ -29608,5 +30084,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -29614,5 +30090,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -29621,45 +30097,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -29667,25 +30143,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Village Green"
@@ -29693,10 +30169,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Common"
@@ -29704,20 +30180,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -29725,5 +30201,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -29731,15 +30207,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -29747,9 +30223,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -29757,39 +30233,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Railway land"
@@ -29797,15 +30273,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -29813,50 +30289,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
@@ -29866,5 +30342,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -29876,5 +30352,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "outer segment"
@@ -29882,5 +30358,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "inner segment"
@@ -29888,5 +30364,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29897,5 +30373,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29903,36 +30379,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29940,5 +30416,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -29947,5 +30423,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -29953,34 +30429,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -29989,15 +30465,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "to way"
@@ -30005,5 +30481,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Route"
@@ -30012,5 +30488,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -30018,5 +30494,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Route type"
@@ -30124,5 +30600,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30133,17 +30609,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ski"
@@ -30211,5 +30687,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30219,9 +30695,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "detour"
@@ -30235,10 +30711,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -30246,31 +30722,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -30279,30 +30755,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -31480,16 +31956,4 @@
 msgstr "aeroway"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34408,19 +34872,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "The selected way does not contain the selected node."
-#~ msgstr[1] "The selected way does not contain all the selected nodes."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Degrees Minutes Seconds"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Enter an upload comment (min. 3 characters)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Please enter a comment for this upload changeset (min. 3 characters)"
-
 #~ msgid "Move"
 #~ msgstr "Move"
@@ -34801,12 +35250,6 @@
 #~ msgstr "Rotate"
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects, that you don't see, "
-#~ "might be using them.<br>Do you really want to delete?"
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Degrees Minutes Seconds"
 
 #~ msgid "Conflicting relation"
@@ -34840,4 +35283,9 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "All the ways were empty"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "The selected way does not contain the selected node."
+#~ msgstr[1] "The selected way does not contain all the selected nodes."
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -35341,7 +35789,4 @@
 #~ msgstr "No intersection found. Nothing was changed."
 
-#~ msgid "Continue anyway"
-#~ msgstr "Continue anyway"
-
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
@@ -35900,7 +36345,4 @@
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 
-#~ msgid "Confirmation"
-#~ msgstr "Confirmation"
-
 #~ msgid "Delete all"
 #~ msgstr "Delete all"
@@ -36147,4 +36589,8 @@
 #~ msgstr "Value of child.getId() > 0 expected. Got {1}."
 
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Please enter a comment for this upload changeset (min. 3 characters)"
+
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Preset group ''{0}'' of group ''{1}''"
@@ -36168,4 +36614,7 @@
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr "Incorrect value of version operator: {0}. Number is expected."
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Missing merge target for object with id {0}"
 
 #~ msgid ""
@@ -36259,4 +36708,7 @@
 #~ "a network problem, please check your<br>your internet connection</html>"
 
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Enter an upload comment (min. 3 characters)"
+
 #~ msgid "Please enter the password name of your OSM account"
 #~ msgstr "Please enter the password name of your OSM account"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 22626)
+++ applications/editors/josm/i18n/po/es.po	(revision 22628)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-02 08:38+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-12 23:19+0000\n"
+"Last-Translator: Pla <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -96,5 +96,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
 msgid "Warning"
-msgstr "Precaucion"
+msgstr "Atención"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:473
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -231,4 +231,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -240,4 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -302,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Cancelar"
@@ -367,4 +369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -423,5 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1406,5 +1409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1474,4 +1477,53 @@
 msgid "Preferences"
 msgstr "Preferencias"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Surveyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburguesería"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Confirmación"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "añadir a la selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1513,4 +1565,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1750,4 +1803,5 @@
 msgstr "Por favor, seleccione al menos una para simplificar."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1755,4 +1809,5 @@
 #: ../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 "Si"
@@ -1803,8 +1858,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "La selección actual no se puede usar para separar."
+msgstr ""
+"La selección actual no puede usarse para división - no hay un nodo "
+"seleccionado."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3047,4 +3103,5 @@
 
 #. 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
@@ -3074,5 +3131,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "Aceptar"
@@ -3290,7 +3347,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Esta a punto de borrar objetos incompletos.<br>Esto causará problemas porque "
@@ -3324,10 +3382,5 @@
 msgstr[1] "Mover {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Eliminado objeto ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3337,4 +3390,10 @@
 msgstr[1] "Purgados {0} objetos"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Eliminado objeto ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3485,4 +3544,5 @@
 msgid "Unable to create directory {0}, autosave will be disabled"
 msgstr ""
+"No se puede crear el directorio {0}. Se deshabilitará el guardado automático."
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
@@ -3494,10 +3554,10 @@
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr ""
+msgstr "IOError creando el archivo. No se guardará automáticamente: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
 #, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr ""
+msgstr "No se pudo borrar el anterior archivo de copia de seguridad {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
@@ -3505,9 +3565,10 @@
 msgid "Error while creating backup of removed layer: {0}"
 msgstr ""
+"Se produjo un error al crear la copia de seguridad de la capa eliminada: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
-msgstr ""
+msgstr "No se pudieron leer los datos osm salvados automáticamente ({0}) - {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
@@ -3704,5 +3765,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "deg° min'' sec\""
-msgstr ""
+msgstr "gradº min' seg''"
 
 #. *
@@ -3711,5 +3772,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "deg° min'' (Nautical)"
-msgstr ""
+msgstr "gradº min' (Nautica)"
 
 #. *
@@ -3748,5 +3809,5 @@
 "incluida"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3759,6 +3820,6 @@
 "no es un error crítico, puede continuar con su trabajo de manera segura."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3768,10 +3829,14 @@
 msgstr "Falta de combinación de destino para la direccion con el ID {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Falta de combinación de destino para el objeto con el ID {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+"El objeto de tipo {0} con id {1} se marcó para borrar, pero no existe en el "
+"conjunto de datos fuente"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3779,5 +3844,5 @@
 msgstr "Falta de combinación de destino para el nodo con el ID {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3786,5 +3851,5 @@
 msgstr "Falta de combinación de destino para la relación con el ID {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3793,4 +3858,18 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Blanco de conbinacion perdida del tipo {0} con el ID {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
+"Conflicto en atributo 'visible' para el objeto de tipo {0} con id {1}\r\n"
+"La misma versión, pero con atributo \"visible\" distinto.  Indica un "
+"problema serio en los conjuntos de datos.  Por ejemplo, los conjuntos de "
+"datos pueden descargarse de diferentes servidores OSM o haber sido "
+"modificados manualmente de forma errónea.  No deberíamos mezclar los "
+"conjuntos de datos."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4100,5 +4179,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "ferrocarril"
@@ -4373,70 +4452,70 @@
 msgstr "Contraseña"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Abrir archivo (cualquier tipo de archivo que puede abrirse con Archivo/Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Bajar el rectángulo límite como gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Descargar datos GPS desde URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Definir idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionadas como propiedades de sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Cambiar la carpeta para todas las configuraciones de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4450,9 +4529,9 @@
 "en megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4462,45 +4541,45 @@
 "esta orden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Hay que cargar algún dato si se usa --selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Inicializar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Actualizando complementos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Instalando complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Ajustes predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Creando la interfaz principal de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr "Datos OSM sin guardar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "Restaurar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4511,14 +4590,33 @@
 "que se utilizó JOSM este se colgó. ¿Desea restaurar lo datos?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "La opción de configuración {0} ha sido eliminada porque ya no se usa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+"<h2>JOSM requiere la versión 6 de Java.</h2>Se detectó la versión Java: {0},"
+"<br> puede <ul><li>actualizar su Java(JRE) o</li><li>usar una versión previa"
+"(compatible con Java 5) de JOSM.</li></ul>Más información:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr "Salir de JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr "Continuar, intentar de todas formas"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Archivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4537,10 +4635,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Vista"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4548,5 +4646,5 @@
 msgstr "Herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4554,5 +4652,5 @@
 msgstr "Predefinidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4563,5 +4661,5 @@
 msgstr "Menú: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4662,17 +4760,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Numérico"
+msgstr "Métrico"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "chino"
+msgstr "Chino"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Oficinas"
+msgstr "Imperial"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5367,5 +5462,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99
 msgid "Cannot apply undecided tag merge item."
-msgstr ""
+msgstr "No se pudo aplicar una etiqueta de mezcla al artículo"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
@@ -5449,5 +5544,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "todos"
@@ -6123,5 +6218,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relaciones"
@@ -6215,10 +6310,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Seleccionar en la lista de relaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Seleccionar relación en la lista de relaciones."
@@ -6837,4 +6932,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7296,5 +7393,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7338,111 +7434,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nombre"
@@ -8137,4 +8234,7 @@
 "<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
+"<html>Hay al menos un miembro en esta relación que se refiere <br>a si "
+"misma</br>Esto creará dependencias circulares, cosa que se desaconseja. "
+"<br>¿Desea continuar con dependencias circulares?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
@@ -8211,5 +8311,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813
 msgid "Relation Editor: Remove Selected"
-msgstr ""
+msgstr "Editor de relaciones: Cancelar selección"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847
@@ -8429,5 +8529,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:388
 msgid "Zoom to"
-msgstr "Ampliar a"
+msgstr "Zoom a"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
@@ -8577,21 +8677,25 @@
 msgstr "Renombrar el marcador actualmente seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "latitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "longitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "latitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "longitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr "limpiar área de texto"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8600,10 +8704,10 @@
 "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Recuadro delimitador"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8612,15 +8716,15 @@
 msgstr "La cadena \"{0}\" no es un valor double válido."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Para la latitud se requiere un valor en el rango [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Para la longitud se requiere un valor en el rango [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8694,4 +8798,6 @@
 "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
+"<html>No están habilitados ni <strong>{0}</strong> ni <strong>{1}</strong>. "
+"<br>Por favor escoja descargar datos de OSM, GPS o ambos.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
@@ -8744,9 +8850,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
-msgstr ""
+msgstr "Obteniendo nombre de servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
-msgstr ""
+msgstr "Obteniendo nombre de servidor ..."
 
 #. Strings in JFileChooser
@@ -8771,8 +8877,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Tipo"
@@ -8801,6 +8907,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "desconocido"
@@ -8834,4 +8940,11 @@
 "a>.</p></html>"
 msgstr ""
+"<html><p class=\"warning-header\">No existe contenido de ayuda para el tema</"
+"p><p class=\"warning-body\">No está disponible todavía el contenido de ayuda "
+"para  <strong>{0}</strong>.  No existe ni en su idioma local  ({1}) ni en "
+"inglés.  <br><br>Por favor ayude a mejorar el sistema de ayuda de JOSM "
+"diligenciando la información faltante.  Puede o bien editar el e <a href="
+"\"{2}\">tema de ayuda en su idioma local ({1})</a> y el <a href=\"{3}\">tema "
+"de ayuda en inglés</a>.</p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
@@ -8843,4 +8956,8 @@
 "p></html>"
 msgstr ""
+"<html><p class=\"error-header\">Ocurrió un error al obtener información de "
+"ayuda</p><p class=\"error-body\">No se pudo descargar el contenido para el "
+"tema de ayuda para <strong>{0}</strong>. El mensaje de error es (sin "
+"traducirse):<br><tt>{1}</tt></p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
@@ -8850,4 +8967,7 @@
 "network problem, please check<br>your internet connection</html>"
 msgstr ""
+"<html>Fallo al abrir la página de ayuda con URL {0}.<br>Normalmente esto se "
+"debe a algún problema con la red.<br>Por favor, compruebe su conexión de "
+"internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
@@ -8871,4 +8991,7 @@
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
+"<html>La URL actual <tt>{0}</tt><br> es una URL externa. La edición sólo es "
+"posible para los temas de la ayuda<br> que se encuentran en el servidor <tt>"
+"{1}</tt>.</html>"
 
 #. putValue(NAME, tr("Reload"));
@@ -8949,4 +9072,6 @@
 "Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
+"Fallo al establecer la referencia. La referencia con ID {0} no coincide con "
+"el ID del histórico {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
@@ -8970,4 +9095,6 @@
 "history."
 msgstr ""
+"Fallo al establecer la primitiva actual. La versión actual {0} no está "
+"disponible en el histórico."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
@@ -9033,4 +9160,6 @@
 "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
+"<html>Versión <strong>{0}</strong> actualmente editada en la capa \"{1}\"</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
@@ -9039,4 +9168,5 @@
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 msgstr ""
+"<html>Versión <strong>{0}</strong> creada en <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
@@ -9075,5 +9205,5 @@
 #, java-format
 msgid "Version {0} currently edited in data layer ''{1}''"
-msgstr ""
+msgstr "Versión {0} en edición en la capa de datos \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
@@ -9086,4 +9216,6 @@
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
+"No se pudol actualizar la primitiva con id {0} porque la capa actual en "
+"edición es null."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
@@ -9093,4 +9225,6 @@
 "include such a primitive"
 msgstr ""
+"No se pudo actualizar la primitiva con id {0} porque la capa en edición "
+"actual no incluye dicha primitiva."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
@@ -9191,4 +9325,9 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
+"<html>La subida <strong>ha fallado</strong> porque ha intentado borrar el "
+"nodo {0} que está aún en uso en la vía {1}.<br><br> Pulse <strong>{2}</"
+"strong> para descargar todos las vías a las que el nodo {0} pertenece.<br>Si "
+"es necesario JOSM creará conflictos que podrá resolver en el diálogo de "
+"Resolución de Conflictos.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
@@ -9201,4 +9340,6 @@
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
+"Atención: la cabecera de error \"{0}\" no coincide con ninguno de los "
+"patrones esperados."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:49
@@ -9207,7 +9348,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Comentario de subida no válido"
+msgstr "Ingrese un comentario de subida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9251,5 +9391,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:100
 msgid "Upload data to an already existing and open changeset"
-msgstr ""
+msgstr "Subir los datos a un conjunto de cambios ya existente y abierto"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:111
@@ -9310,4 +9450,6 @@
 "exception."
 msgstr ""
+"Atención: error al poner el Diálogo de Credenciales siempre encima. Se "
+"atrapó una excepción de seguridad."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
@@ -9337,4 +9479,6 @@
 "and a valid password."
 msgstr ""
+"La autenticación en la API OSM \"{0}\" ha fallado. Introduzca un nombre de "
+"usuario y contraseña válidos."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -9368,4 +9512,6 @@
 "password may be transferred unencrypted."
 msgstr ""
+"Atención: dependiendo del método de autenticación que use el servidor proxy "
+"puede que la contraseña sea transmitida sin encriptar."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
@@ -9388,8 +9534,11 @@
 "working."
 msgstr ""
+"No se pudo recuperar la lista de sus changeset abiertos porque<br>JOSM no "
+"conoce su identidad.<br>Ha elegido trabajar anonimamente o no tener derecho "
+"a conocer<br> la identidad del usuario en cuyo nombre está trabajando."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
 msgid "Missing user identity"
-msgstr ""
+msgstr "Identidad de usuario perdida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:120
@@ -9405,5 +9554,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:949
 msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Lanza un diálogo para seleccionar un archivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -9411,7 +9560,9 @@
 msgstr "Seleccione nombre de fichero"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
+#: build/specialmessages.java:89
 msgid "No"
 msgstr "No"
@@ -9421,9 +9572,10 @@
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
+"La capa \"{0}\" tiene modificaciones que deben ser subidas al servidor."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "La capa \"{0}\" no tiene modificaciones para subir al servidor."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
@@ -9433,4 +9585,6 @@
 "''{1}''."
 msgstr ""
+"La capa \"{0}\" tiene modificaciones que deberían ser salvadas en su archivo "
+"asociado \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
@@ -9450,10 +9604,10 @@
 #, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr ""
+msgstr "La capa \"{0}\" no está respaldada en un archivo."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr ""
+msgstr "El archivo \"{0}\" no es modificable. Elija otro nombre de archivo."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
@@ -9461,10 +9615,10 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Selección de subida la capa ''{0}'' al servidor ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
 #, java-format
 msgid "Saving layer to ''{0}'' ..."
-msgstr ""
+msgstr "Salvando la capa \"{0}\"..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
@@ -9489,5 +9643,9 @@
 "discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
+"<html>La capa {0} tiene conflictos por resolver.<br>Resuélvalos antes o "
+"descarte las modificaciones.<br>Capa con conflictos:</html>"
 msgstr[1] ""
+"<html>Las capas {0} tienen conflictos por resolver.<br>Resuélvalos antes o "
+"descarte las modificaciones.<br>Capas con conflictos:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
@@ -9505,5 +9663,11 @@
 "html>"
 msgstr[0] ""
+"<html>La capa {0} necesita ser guardada pero no tiene archivo asociado."
+"<br>Seleccione un archivo para esta capa o descarte los cambios.<br>Capa sin "
+"fichero:</html>"
 msgstr[1] ""
+"<html>Las capas {0} necesitan ser guardadas pero no tienen archivos "
+"asociados.<br>Seleccione un archivo para cada capa o descarte los cambios."
+"<br>Capas sin fichero:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
@@ -9522,5 +9686,11 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
+"<html>La capa {0} necesita ser guardada pero no tiene un archivo "
+"asociado<br>que no puede ser escrito.<br>Seleccione otro archivo para esta "
+"capa o descarte los cambios.<br>Capa con un fichero de sólo lectura:</html>"
 msgstr[1] ""
+"<html>Las capas {0} necesitan ser guardadas pero no tienen archivos "
+"asociados<br>que puedan ser escritos.<br>Seleccione otro archivo para cada "
+"capa o descarte los cambios.<br>Capas con un fichero de sólo lectura:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -9530,5 +9700,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
 msgid "Close this dialog and resume editing in JOSM"
-msgstr ""
+msgstr "Cerrar este diálogo y continuar la edición en JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
@@ -9580,5 +9750,9 @@
 "cancelled or have failed.</html>"
 msgstr[0] ""
+"<html>Una subida y/o una operación de guardado de una de las capas con "
+"modificaciones<br>ha sido cancelada o ha fallado.</html>"
 msgstr[1] ""
+"<html>Hay subidas y/o operaciones de {0} capas con modificaciones<br>que han "
+"sido canceladas o han fallado.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -9693,5 +9867,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Apply tags to the changeset data is uploaded to"
-msgstr ""
+msgstr "Aplicar etiquetas al conjunto de cambios que se está subiendo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
@@ -9720,17 +9894,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Comentario de subida no válido"
+msgstr "Por favor revise el comentario de subida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Invertir"
+msgstr "Revisar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Continuar"
+msgstr "Continuar como está"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9742,26 +9913,30 @@
 "explain your change, you will make life<br />easier for many other mappers."
 msgstr ""
+"Su comentario de subida está <i>vacío</i>, o <i>muy corto</i>.<br /><br />, "
+"lo cual es permitido, pero por favor tenga en cuenta que muchos usuarios que "
+"están <br />revisando cambios en su área dependen de comentarios "
+"significativos en los conjuntos de cambios<br /> para entender qué está "
+"sucediendo!<br /><br />Si emplea un minuto para explicar su cambio, hara la "
+"vida<br /> más sensilla para otr@s maper@s"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
 msgid "Return to the previous dialog to enter a more descriptive comment"
-msgstr ""
+msgstr "Volver al diálogo anterior para incluir un comentario descriptivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Ir a la página anterior"
+msgstr "Cancelar y volver al diálogo anterior"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
 msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Ignore esta recomendación y suba de todas formas"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "No mostrar de nuevo"
+msgstr "No mostrar este mensaje de nuevo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
 msgid "Please enter a valid chunk size first"
-msgstr ""
+msgstr "Por favor ingrese primero un tamaño de elemento válido"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:402
@@ -9814,4 +9989,6 @@
 msgid "The changeset is <strong>left open</strong> after this upload"
 msgstr ""
+"El conjunto de cambios está <strong>parcialmente abierto</strong> después de "
+"esta subida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:59
@@ -9866,4 +10043,8 @@
 "proceed with <strong>multiple changesets</strong>"
 msgstr ""
+"{0} objetos exceden el máximo permitido de {1} en un conjunto de cambios "
+"para el servidor \"{2}\". Por favor <a href=\"urn:advanced-configuration"
+"\">configure</a> cómo proceder con <strong>varios conjuntos de cambios</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
@@ -9893,13 +10074,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:87
 msgid "Go back to Upload Dialog"
-msgstr ""
+msgstr "Volver al diálogo de subida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:89
 msgid "Click to return to the Upload Dialog"
-msgstr ""
+msgstr "Presione el botón izquierdo para volver al diálogo de subida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:93
 msgid "Abort"
-msgstr ""
+msgstr "Abortar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:95
@@ -9914,4 +10095,7 @@
 "on the server ''{1}''."
 msgstr ""
+"El servidor reportó que el conjunto de cambios actual fue cerrado.<br>Esto "
+"generalmente sucede porque el tamaño del conjunto de cambios excede el "
+"tamaño máximo<br> de {0} objetos en el servidor \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
@@ -9930,4 +10114,8 @@
 "editing.<br>"
 msgstr ""
+"Elija ''<strong>{0}</strong>'' para continuar subiendo conjuntos de cambios "
+"nuevos adicionales.<br> Presione ''<strong>{1}</strong>'' para volver al "
+"diálogo de subida.<br> Presione ''<strong>{2}</strong>'' para interrumpir la "
+"subida y volver a la edición del mapa.<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
@@ -9943,9 +10131,11 @@
 "object and retrying to upload."
 msgstr ""
+"Advertencia: El objeto \"{0}\" ya ha sido borrado del servidor. Omitiendo "
+"este objeto y reintentando subir."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195
 #, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "El objeto \"{0}\" ya ha sido borrado. Se omite el objeto en la subida."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
@@ -9957,5 +10147,5 @@
 msgstr[1] "Subiendo {0} objetos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9969,4 +10159,6 @@
 "be uploaded to the server.</html>"
 msgstr ""
+"<html>Marcar objetos modificados <strong>de la selección actual</strong> "
+"para subirlos al servidor.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
@@ -9975,4 +10167,6 @@
 "server.</html>"
 msgstr ""
+"<html>Marcar <strong>objetos borrados localmente</strong> que serán borrados "
+"en el servidor.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
@@ -9988,4 +10182,6 @@
 msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
 msgstr ""
+"Advertencia: valor inesperado para la llave \"{0}\" en preferencias, se "
+"obtuvo \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
@@ -10012,8 +10208,10 @@
 "upload {0} objects. Which strategy do you want to use?</html>"
 msgstr ""
+"<html>Se requiere <strong>varios conjuntos de cambios</strong> para subir "
+"{0} objetos. ¿Qué estrategia va a emplear?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
 msgid "Fill up one changeset and return to the Upload Dialog"
-msgstr ""
+msgstr "Llenar un conjunto de cambios y volver al diálogo de subida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
@@ -10032,4 +10230,7 @@
 "size {1} on server ''{2}'' is exceeded.</html>"
 msgstr ""
+"<html>No se puede subir {0} objetos en una sola solicitud porque se "
+"<br>excede el tamaño máximo de conjuntos de cambios de {1} en el servidor "
+"\"{2}\" </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
@@ -10039,4 +10240,6 @@
 "upload {0} objects. What strategy do you want to use?</html>"
 msgstr ""
+"<html>Se requiere <strong>varios conjuntos de cambios</strong>para subir {0} "
+"objetos. ¿Qué estrategia desea emplear?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -10061,5 +10264,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
 msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr ""
+msgstr "Tamaño de bloque inválido <= 0, por favor ingrese un entero > 1"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413
@@ -10068,8 +10271,10 @@
 msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
 msgstr ""
+"Tamaño de bloque {0} excede el tamaño máximo de conjunto de cambios de {1} "
+"en el servidor \"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
 msgid "Please enter an integer > 1"
-msgstr ""
+msgstr "Por favor ingrese un entero > 1"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422
@@ -10139,5 +10344,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Descripción"
@@ -10228,17 +10433,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:683
 msgid "Download near:"
-msgstr ""
+msgstr "Descargar cercanos:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track only"
-msgstr ""
+msgstr "Solamente trazas"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "waypoints only"
-msgstr ""
+msgstr "Solamente puntos de vía"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:684
 msgid "track and waypoints"
-msgstr ""
+msgstr "trazas y puntos de vía"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:810
@@ -10338,4 +10543,7 @@
 "them with audio data.</html>"
 msgstr ""
+"<html>Se descargaron del servidor los datos de la capa GPX \"{0}\", <br>Dado "
+"que los puntos de vía no incluyen una marca de tiempo, no se pueden "
+"correlacionar con datos de audio.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1325
@@ -10364,4 +10572,7 @@
 "them with images.</html>"
 msgstr ""
+"<html>Se descargaron del servidor los datos en la capa GPX \"{0}\",<br>Dado "
+"que los puntos de vía no incluyen una marca de tiempo, no se pueden "
+"correlacionar con imágenes.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:115
@@ -10381,5 +10592,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:314
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
+msgstr "Advertencia: mezclando datos de 0.5 y 0.6 resulta en versión 0.5"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
@@ -10392,5 +10603,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 msgid "Click to close this dialog and continue editing"
-msgstr ""
+msgstr "botón izquierdo para cerrar este diálogo y continuar editando"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
@@ -10424,5 +10635,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
 msgid "Dataset consistency test"
-msgstr ""
+msgstr "Prueba de consistencia de conjunto de datos"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:638
@@ -10432,5 +10643,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:641
 msgid "Following problems found:"
-msgstr ""
+msgstr "Se encontraron los siguientes problemas"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
@@ -10439,4 +10650,6 @@
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
+"<html>Se considera dañino subir datos GPS sin procesar como datos de mapa. "
+"<br>Si desea subir trazas, ver:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
@@ -10564,4 +10777,6 @@
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
+"<html>Use fotos de un reloj preciso, <br>p.e. la pantalla con la hora del "
+"GPS</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:516
@@ -10571,5 +10786,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
 msgid "Matches first photo with first gpx point"
-msgstr ""
+msgstr "Aparear la primera foto con el primer punto gpx"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
@@ -10579,5 +10794,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:523
 msgid "Override position for: "
-msgstr ""
+msgstr "sobreescribir la posición para: "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
@@ -10589,5 +10804,5 @@
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
-msgstr ""
+msgstr "Imágenes ya etiquetadas ({0}/{1})"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:538
@@ -10626,9 +10841,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:693
 msgid "No images could be matched!"
-msgstr ""
+msgstr "No se pudo aparear imagen alguna!"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:817
 msgid "No gpx selected"
-msgstr ""
+msgstr "No se ha seleccionado ningún gpx"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:822
@@ -10638,5 +10853,7 @@
 "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 msgstr[0] ""
+"<html>Se emparejo <b>{0}</b> foto de <b>{1}</b> con la traza GPX.</html>"
 msgstr[1] ""
+"<html>Se emparejo <b>{0}</b> fotos de <b>{1}</b> con la traza GPX.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:903
@@ -10785,6 +11002,6 @@
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Se encontró {0} elemento para posicionar con GPS"
+msgstr[1] "Se encontraron {0} elementos para posicionar con GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
@@ -10799,4 +11016,6 @@
 "permanently lost!</h3></html>"
 msgstr ""
+"<html><h3>Borrar el archivo {0} del disco?<p>Se perderá irremediablemente el "
+"archivo!</h3></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:675
@@ -10821,5 +11040,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
-msgstr ""
+msgstr "Mostrar imágenes geolocalizadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
@@ -10838,5 +11057,5 @@
 #, java-format
 msgid "Geoimage: {0}"
-msgstr ""
+msgstr "Geoimagen: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
@@ -10867,5 +11086,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
-msgstr ""
+msgstr "Mover diálogo al panel lateral"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
@@ -10893,4 +11112,6 @@
 "Direction {0}°"
 msgstr ""
+"\n"
+"Dirección {0}º"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
@@ -10995,9 +11216,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:129
 msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "Patrón de guiones ilegal, los valores deben ser positivos"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:135
 msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
+msgstr "Patrón de guiones ilegal, por lo menos un valor debe ser > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:102
@@ -11006,4 +11227,6 @@
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
+"Advertencia: Fallo al cargar estilos Mappaint de \"{0}\". La excepción fue: "
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:105
@@ -11012,4 +11235,6 @@
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
+"Advertencia: Fallo al interpretar estilos Mappaint de \"{0}\". La excepción "
+"fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -11017,5 +11242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:234
 msgid "Access Token Key:"
-msgstr ""
+msgstr "Llave de acceso:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
@@ -11023,9 +11248,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:246
 msgid "Access Token Secret:"
-msgstr ""
+msgstr "Llave secreta de acceso:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
 msgid "Save Access Token in preferences"
-msgstr ""
+msgstr "Almacenar llave de acceso en preferencias"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
@@ -11034,4 +11259,7 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
+"<html>Seleccione para almacenar llave de Acceso en las preferencias de JOSM."
+"<br>Desmarque para usar la llave de Acceso únicamente en esta sesión de JOSM."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -11097,4 +11325,8 @@
 "html>"
 msgstr ""
+"<html>Correr un procedimiento totalmente automático para obtener una llave "
+"de acceso del sitio web OSM.<br>JOSM accede al sitio OSM a través del "
+"usuario JOSM y<br>autoriza total y automáticamente el usuario y descarga una "
+"llave de acceso.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
@@ -11106,4 +11338,9 @@
 "submitted by JOSM.</html>"
 msgstr ""
+"<html>Ejecutar un proceso semi automático para obtener una llave de acceso "
+"del sitio OSM.<br>JOSM envía las solicitudes estándar OAuth para obtener una "
+"llave de solicitud y  una<br>llave de Acceso.  Envía al usuario al sitio OSM "
+"en un navegador aparte<br> para autenticarse y aceptar la solicitud de llave "
+"enviada por JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
@@ -11112,4 +11349,6 @@
 "outside<br>of JOSM.</html>"
 msgstr ""
+"<html>Ingresar una llave de Acceso manualmente si fue generada y descargada "
+"por fuera<br>de JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
@@ -11149,10 +11388,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:174
 msgid "Advanced OAuth properties"
-msgstr ""
+msgstr "Propiedades avanzadas de OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:234
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:361
 msgid "Accept Access Token"
-msgstr ""
+msgstr "Aceptar llave de Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:235
@@ -11172,4 +11411,5 @@
 msgid "Click to redirect you to the authorization form on the JOSM web site"
 msgstr ""
+"Presione para redirigirle al formulario de autorización en el sitio JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:361
@@ -11180,5 +11420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:362
 msgid "Run the automatic authorization steps again"
-msgstr ""
+msgstr "Volver a ejecutar los pasos automáticos de autorización"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:376
@@ -11187,5 +11427,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
 msgid "Test Access Token"
-msgstr ""
+msgstr "Probar llave de Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:405
@@ -11193,5 +11433,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
 msgid "Please enter your OSM user name"
-msgstr ""
+msgstr "Por favor ingrese su usuario de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:407
@@ -11210,9 +11450,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:428
 msgid "The password cannot be empty. Please enter your OSM password"
-msgstr ""
+msgstr "La clave no puede ser vacía. Por favor ingrese su clave de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:438
 msgid "Authorize JOSM to access the OSM API"
-msgstr ""
+msgstr "Autorizar JOSM para acceder al API OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:452
@@ -11222,4 +11462,7 @@
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
+"<html>Falló proceso automático de obtener una llave de Acceso OAuth<br> del "
+"servidor OSM.<br><br>Por favor intente de nuevo o elija otro esquema de de "
+"autorización,<br>por ejemplo, autorización semi automática o manual.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
@@ -11227,5 +11470,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:498
 msgid "OAuth authorization failed"
-msgstr ""
+msgstr "Falló la autorización OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:467
@@ -11252,24 +11495,26 @@
 "server ''{0}''."
 msgstr ""
+"Por favor ingrese una llave de Acceso Oauth que esté autorizada para acceder "
+"al servidor OSM \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
 msgid "Save Access Token to preferences"
-msgstr ""
+msgstr "Almacenar llave de Acceso a preferencias"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
 msgid "Access Token"
-msgstr ""
+msgstr "Llave de Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
 msgid "Advanced OAuth parameters"
-msgstr ""
+msgstr "Parámetros Avanzados de OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
 msgid "Enter the OAuth Access Token"
-msgstr ""
+msgstr "Ingrese la Llave de Acceso OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
 msgid "Enter advanced OAuth properties"
-msgstr ""
+msgstr "Ingresar propiedades avanzadas de OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
@@ -11282,5 +11527,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
 msgid "Please enter an Access Token Key"
-msgstr ""
+msgstr "Por favor ingrese una Llave de Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
@@ -11288,8 +11533,10 @@
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
+"La llave de Acceso no puede estar vacía.  Por favor ingrese una llave de "
+"Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
 msgid "Please enter an Access Token Secret"
-msgstr ""
+msgstr "Por favor ingrese llave de Acceso secreta"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
@@ -11298,9 +11545,11 @@
 "Secret"
 msgstr ""
+"La llave de Acceso secreta no puede ser vacía.  Por favor ingrese una llave "
+"de Acceso secreta."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
 msgid "Click to test the Access Token"
-msgstr ""
+msgstr "Presione para probar la llave de Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:115
@@ -11310,4 +11559,6 @@
 "your behalf (<a href=\"{0}\">more info...</a>)."
 msgstr ""
+"Con OAuth autoriza a JOSM el derecho a subir datos de mapa y trazas GPS por "
+"usted (<a href=\"{0}\">más información...</a>)."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
@@ -11318,13 +11569,13 @@
 #, java-format
 msgid "Get an Access Token for ''{0}''"
-msgstr ""
+msgstr "Obtener una llave de Acceso para \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:344
 msgid "Close the dialog and cancel authorization"
-msgstr ""
+msgstr "Cerrar el diálogo y cancelar autorización"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:363
 msgid "Close the dialog and accept the Access Token"
-msgstr ""
+msgstr "Cerrar el diálogo y aceptar la llave de Autorización"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
@@ -11372,10 +11623,10 @@
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
-msgstr ""
+msgstr "Autenticando sesión para el usaurio \"{0}\"..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr ""
+msgstr "Autorizando llave de solicitud \"{0}\"..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
@@ -11386,21 +11637,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
 msgid "Allow to upload map data"
-msgstr ""
+msgstr "Permitir subir datos de mapa"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
 msgid "Select to grant JOSM the right to upload map data on your behalf"
 msgstr ""
+"Seleccionar para permitir a JOSM tener derecho para subir datos al mapa en "
+"su nombre"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
 msgid "Allow to upload GPS traces"
-msgstr ""
+msgstr "Permitir subir trazas GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
 msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
 msgstr ""
+"Seleccione para proveer a JOSM del permiso para subir trazas de GPS a su "
+"nombre"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
 msgid "Allow to download your private GPS traces"
-msgstr ""
+msgstr "Permitir descargar sus trazas GPS privadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
@@ -11409,24 +11664,30 @@
 "layers"
 msgstr ""
+"Elegir para proveer a JOSM el derecho para descargar sus trazas GPS privadas "
+"en capas JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
 msgid "Allow to read your preferences"
-msgstr ""
+msgstr "Permitir leer sus preferencias"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
 msgid "Select to grant JOSM the right to read your server preferences"
 msgstr ""
+"Seleccionar para ofrecer a JOSM el derecho de leer sus preferencias de "
+"servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
 msgid "Allow to write your preferences"
-msgstr ""
+msgstr "Permitir escribir sus preferencias"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
 msgstr ""
+"Seleccionar para permitir que JOSM tenga permiso para escribir sus "
+"preferencias de servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
 msgid "Retrieving OAuth Access Token..."
-msgstr ""
+msgstr "Obteniendo llave de Acceso OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
@@ -11434,28 +11695,29 @@
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
 msgstr ""
+"<html>Falló la descarga de una llave de Acceso OAuth de \"{0}\".</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
 msgid "Request Failed"
-msgstr ""
+msgstr "Solicitud fallida"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
 msgid "Retrieving OAuth Request Token..."
-msgstr ""
+msgstr "Descargando Llave de Solicitud OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
 #, java-format
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
-msgstr ""
+msgstr "<html>Falló la descarga de Llave de solicitud de \"{0}\".</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:83
 msgid "Display Advanced OAuth Parameters"
-msgstr ""
+msgstr "Mostrar Parámetros avanzados de OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:166
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369
 msgid "Retrieve Request Token"
-msgstr ""
+msgstr "Obtener llave de Solicitud"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
@@ -11465,16 +11727,18 @@
 "Token from ''{1}''.</html>"
 msgstr ""
+"<html>Por favor seleccione <strong>{0}</strong> para obtener una llave de "
+"solicitud OAuth de \"{1}\".</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr ""
+msgstr "<html>Paso 1/3: Descarga de Llave de Solicitud OAuth</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205
 msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
-msgstr ""
+msgstr "<html> Paso 2/3: Autorizar y descargar llave de Acceso</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
 msgid "Request Access Token"
-msgstr ""
+msgstr "Solicitar llave de Acceso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
@@ -11489,4 +11753,11 @@
 "</html>"
 msgstr ""
+"<html> JOSM descargó exitósamente una llave de Solicitud. JOSM ahora está "
+"lanzando una página de autorización en un navegador externo.  Por favor "
+"ingrese su nombre de usuario y clave de OSM y siga las instrucciones para "
+"autorizar la llave de solicitud.  Después vuelva a este diálogo y seleccione "
+"en <strong>{0}</strong><br><br>Si falla el abrir un navegador externo puede "
+"copiar la siguiente dirección de autorización y pegarla en el campo de "
+"dirección del navegador.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
@@ -11505,4 +11776,7 @@
 "authorization to the OSM server.<br><br>The access token is: </html>"
 msgstr ""
+"<html>JOSM ha descargado exitósamente la llave de Acceso.  Puede aceptarla.  "
+"JOSM la usará en el futuro para autenticación y autorización al servidor OSM."
+"<br><br>La llave de acceso es: </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
@@ -11535,4 +11809,6 @@
 msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
 msgstr ""
+"No está permitida la obtención de detalles usuarios con la llave de Acceso "
+"\"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
@@ -11817,5 +12093,5 @@
 msgstr "Colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11826,31 +12102,31 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Archivos locales"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Ninguno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forzar lineas si no hay segmentos importados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Dibujar más grandes los puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Dibujar el valor HDOP de forma circular"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidad (rojo=lento, verde=rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -11858,5 +12134,5 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color único (puede ser personalizado desde las capas nombradas)"
@@ -11864,5 +12140,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11884,5 +12160,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11924,5 +12200,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11936,65 +12212,70 @@
 msgstr "Pie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Dibujar las flechas de dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida (poco vistosa)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Solo en la cabecera de la vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Dibujar los números de orden de los segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibujar los límites de los datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Dibujar nodos virtuales en el modo selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Dibujar las capas inactivas en otro color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Suavizar los gráficos del mapa (antialias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Crear marcadores al leer GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Barco"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12004,9 +12285,9 @@
 "capa gpx."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12016,9 +12297,9 @@
 "Valor ''-1'' para dibujar todas las líneas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Longitud máxima de los archivos locales (en metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12027,10 +12308,10 @@
 "dibujarlas todas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Longitud máxima (en metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12039,10 +12320,10 @@
 "información de la línea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12051,5 +12332,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12058,13 +12339,13 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "dibuje grandes los puntos gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12074,9 +12355,9 @@
 "personalizado en el Gestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Colores de puntos y segmentos de trazas según velocidades."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12084,5 +12365,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12090,32 +12371,31 @@
 "medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Coloreado de traza y punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "imagen del waypoint"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Dibujar pistas de dirección para los segmentos de vía"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Dibujar los números de orden de todos los segmentos de una vía"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12124,10 +12404,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibujar los límites de los datos descargados del servidor"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12136,9 +12416,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dibujar las capas inactivas en un color diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -12507,7 +12787,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Capa para mediciones"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13363,5 +13642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14983,5 +15262,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15009,5 +15288,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15261,5 +15540,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpolación de números de portales"
@@ -15720,5 +15999,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Edificios"
@@ -15957,5 +16236,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17965,7 +18244,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "versión resuelta:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18594,13 +18872,13 @@
 msgstr "Edificios entre medianeras"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Editar zapatería"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Separador"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19722,5 +20000,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -21814,5 +22092,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Referencia"
@@ -22351,5 +22629,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "metal"
@@ -22362,5 +22640,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "bosque"
@@ -22638,4 +22916,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22664,9 +23004,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "sí"
@@ -22776,9 +23147,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "no"
@@ -23202,5 +23604,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "senda"
@@ -23235,5 +23637,5 @@
 msgstr "buena"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "intermedia"
@@ -23247,5 +23649,13 @@
 msgstr "pésima"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Sillas de ruedas"
@@ -23374,4 +23784,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23403,14 +23821,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operador"
@@ -23672,12 +24094,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Altitud"
@@ -24530,5 +24952,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Voltaje"
@@ -24840,6 +25262,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24891,32 +25315,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -24925,4 +25349,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24975,174 +25400,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Tipos de combustible:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "91 octanos"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "95 octanos"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "98 octanos"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "100 octanos"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (mezcla al 10% de etanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (mezcla al 85% de etanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GLP (Gas licuado de petróleo)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25172,7 +25598,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -25188,5 +25614,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "subterráneo"
@@ -25199,6 +25625,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "De pago"
@@ -25374,5 +25800,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -25409,6 +25835,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Refugio"
@@ -25416,5 +25842,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Banco"
@@ -25533,5 +25959,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Baliza"
@@ -25591,11 +26017,241 @@
 msgstr "Editar hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Estrellas"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -25603,20 +26259,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Editar motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Cabaña o bungalow"
@@ -25624,10 +26280,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Editar cabaña o bungalow"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Albergue"
@@ -25635,30 +26291,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -25666,10 +26322,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -25680,5 +26336,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -25686,11 +26342,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Cocina"
@@ -25698,78 +26354,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "francés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "sandwich / emparedado"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -25777,17 +26434,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "fish_and_chips (papas y pescado fritos)"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "pollo"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Cafetería"
@@ -25795,9 +26464,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -25805,19 +26475,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Editar pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -25825,9 +26496,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Discoteca"
@@ -25835,24 +26507,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Editar discoteca"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museo"
@@ -25860,9 +26533,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -25871,9 +26544,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -25881,24 +26554,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Trabajo artístico"
@@ -25906,5 +26579,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Editar trabajo artístico"
@@ -25912,19 +26585,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topográfico"
@@ -25962,5 +26635,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25968,28 +26641,28 @@
 msgstr "calle"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "sitio"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "ciudad"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "región"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -25999,5 +26672,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Rutas mostradas para:"
@@ -26005,5 +26678,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Sendero"
@@ -26011,6 +26684,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -26018,5 +26691,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Bicicleta de montaña"
@@ -26024,6 +26697,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Esquí"
@@ -26031,5 +26704,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Equitación"
@@ -26037,54 +26710,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... otros modos de desplazamiento posible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "aviso"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "vida salvaje"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Poste indicador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "poste"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -26092,29 +26764,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Descripción detallada"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de teléfono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -26122,25 +26794,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Castillo"
@@ -26149,19 +26821,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -26170,9 +26842,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -26180,10 +26852,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Sitio paleontológico"
@@ -26191,5 +26863,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Editar sitio paleontológico"
@@ -26197,15 +26869,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -26213,55 +26885,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Mojón"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Editar mojón"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -26269,35 +26941,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -26311,6 +26983,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -26726,6 +27398,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26760,240 +27432,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Cancha de juego"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Editar cancha de juego"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -27035,23 +27707,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "tipo"
@@ -27093,211 +27765,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "cancha de juego"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -27305,52 +27977,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Tiro"
@@ -27358,204 +28030,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Edificio"
@@ -27563,5 +28235,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Edificio público"
@@ -27569,10 +28241,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -27580,10 +28252,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Embajada"
@@ -27591,10 +28263,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -27603,10 +28275,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Prisión"
@@ -27615,10 +28287,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Policía"
@@ -27628,10 +28300,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -27640,10 +28312,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -27651,5 +28323,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -27657,15 +28329,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Escuela"
@@ -27673,10 +28345,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Universidad"
@@ -27684,10 +28356,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -27695,5 +28367,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -27701,5 +28373,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Cine"
@@ -27708,10 +28380,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Biblioteca"
@@ -27720,9 +28392,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -27730,10 +28402,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teatro"
@@ -27742,10 +28414,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -27755,5 +28427,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -27762,6 +28434,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religión"
@@ -27770,66 +28442,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Confesión"
@@ -27838,81 +28510,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Direcciones"
@@ -27921,5 +28593,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -27927,5 +28599,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Número de portal"
@@ -27933,25 +28605,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Nombre de la calle"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Código del país"
@@ -27960,5 +28632,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Editar interpolación de números de portales"
@@ -27966,61 +28638,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -28028,25 +28700,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Faro"
@@ -28054,10 +28726,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -28065,10 +28737,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Tubería"
@@ -28077,41 +28749,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "aguas residuales"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "cualquier sustancia"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Localización"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "sumergido"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "en superficie"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -28121,10 +28793,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Grúa"
@@ -28132,5 +28804,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Editar grúa"
@@ -28138,10 +28810,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -28149,10 +28821,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -28160,23 +28832,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "interiores"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "exteriores"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -28186,35 +28858,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -28223,10 +28895,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -28235,5 +28907,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -28241,10 +28913,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -28255,23 +28927,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Referencia de la torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -28280,20 +28952,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Tipo de línea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28301,55 +28973,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Cantidad de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de alambres (mejor: conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "sencillo"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "doble"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Teléfono"
@@ -28358,5 +29030,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -28364,5 +29036,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Monedas"
@@ -28370,5 +29042,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Billetes"
@@ -28376,5 +29048,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -28382,5 +29054,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -28388,15 +29060,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -28405,5 +29077,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -28411,35 +29083,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Papeleras"
@@ -28447,5 +29119,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Editar papeleras"
@@ -28454,31 +29126,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Respaldo"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "piedra"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Color"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "marrón"
@@ -28557,5 +29229,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28565,31 +29237,31 @@
 msgstr "zona verde"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "blanco"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Número de asientos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -28598,30 +29270,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fuente"
@@ -28630,10 +29302,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -28642,10 +29314,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Hidrante contra incendios"
@@ -28654,5 +29326,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Editar hidrante contra incendios"
@@ -28660,5 +29332,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -28666,15 +29338,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Comercios"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Concesionario de automóviles"
@@ -28682,10 +29354,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Tienda de bicicletas"
@@ -28694,28 +29366,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Editar tienda de bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -28723,9 +29395,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -28733,27 +29405,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Carnicería"
@@ -28761,9 +29433,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Panadería"
@@ -28771,9 +29443,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Floristería"
@@ -28781,18 +29453,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -28800,54 +29472,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Tienda de informática"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de informática"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Editar tienda Hi-Fi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -28855,9 +29527,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Ferretería"
@@ -28865,9 +29537,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Editar ferretería"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -28875,54 +29547,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -28930,9 +29602,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Lavandería"
@@ -28940,9 +29612,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -28950,24 +29622,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Óptica"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -28975,5 +29647,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -28981,97 +29653,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Tarjetas de fidelización o descuento"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banco"
@@ -29079,14 +29751,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -29094,5 +29766,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -29100,15 +29772,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr ""
@@ -29117,18 +29789,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Editar médicos"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -29136,5 +29808,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -29142,9 +29814,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Hospital"
@@ -29152,10 +29824,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -29164,5 +29836,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -29171,20 +29843,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Número de teléfono"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -29192,5 +29859,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -29199,64 +29866,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografía"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Región"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Municipio"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -29264,15 +29931,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -29280,10 +29947,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr ""
@@ -29293,5 +29960,5 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr ""
@@ -29300,15 +29967,15 @@
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr ""
@@ -29316,5 +29983,5 @@
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr ""
@@ -29324,5 +29991,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Paraje"
@@ -29330,10 +29997,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Isla"
@@ -29341,10 +30008,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Islote"
@@ -29352,5 +30019,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -29358,5 +30025,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -29364,10 +30031,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Pico"
@@ -29375,10 +30042,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Glaciar"
@@ -29386,10 +30053,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Volcán"
@@ -29397,70 +30064,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Árbol"
@@ -29469,15 +30136,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Bosque"
@@ -29486,5 +30153,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -29492,17 +30159,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -29511,14 +30178,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -29526,25 +30193,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Braña"
@@ -29552,10 +30219,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -29563,5 +30230,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -29569,5 +30236,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -29576,45 +30243,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -29622,15 +30289,15 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Jardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr ""
@@ -29639,10 +30306,10 @@
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Editar zonas con hierba"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -29652,10 +30319,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -29663,20 +30330,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -29684,5 +30351,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -29690,15 +30357,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Camposanto (para los cementerios próximos a las iglesias)"
@@ -29706,9 +30373,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -29716,39 +30383,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -29756,15 +30423,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -29772,50 +30439,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
@@ -29825,5 +30492,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -29835,5 +30502,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "segmento exterior"
@@ -29841,5 +30508,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "segmento interior"
@@ -29847,5 +30514,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Frontera"
@@ -29856,5 +30523,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Editar frontera"
@@ -29862,36 +30529,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Tipo de frontera"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "administrativa"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Nivel administrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29899,5 +30566,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -29906,5 +30573,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -29912,34 +30579,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "solo ir recto"
@@ -29948,15 +30615,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "a través de nodo o vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "a la vía"
@@ -29964,5 +30631,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Ruta"
@@ -29971,5 +30638,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -29977,5 +30644,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -30083,5 +30750,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30092,17 +30759,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ski"
@@ -30170,5 +30837,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30178,9 +30845,9 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "desvío"
@@ -30194,10 +30861,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -30205,31 +30872,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -30238,30 +30905,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -31439,16 +32106,4 @@
 msgstr "aerovía"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34367,20 +35022,4 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "La vía seleccionada no contiene el nodo seleccionado."
-#~ msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grados minutos segundos"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Introduzca un comentario para la subida (mínimo 3 caracteres)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Introduzca un comentario para la subida de este set de cambios (mín. 3 "
-#~ "caracteres)"
-
 #~ msgid "Move"
 #~ msgstr "Mover"
@@ -34638,4 +35277,7 @@
 #~ msgstr "Dividir segmento de vía"
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grados minutos segundos"
+
 #~ msgid "hikingmap"
 #~ msgstr "topoguía"
@@ -34764,4 +35406,9 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "Todas la vías están vacías"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "La vía seleccionada no contiene el nodo seleccionado."
+#~ msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -35146,7 +35793,4 @@
 #~ msgid "Zone"
 #~ msgstr "Zona"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Continuar de todos modos"
 
 #~ msgid "closedway"
@@ -35783,7 +36427,4 @@
 #~ "formas?"
 
-#~ msgid "Confirmation"
-#~ msgstr "Confirmación"
-
 #~ msgid "Delete all"
 #~ msgstr "Borrar todo"
@@ -36131,4 +36772,7 @@
 #~ "</html>"
 
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Falta de combinación de destino para el objeto con el ID {0}"
+
 #~ msgctxt "filter"
 #~ msgid "C"
@@ -36160,4 +36804,12 @@
 #~ msgstr "Punto GPS"
 
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Introduzca un comentario para la subida (mínimo 3 caracteres)"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Introduzca un comentario para la subida de este set de cambios (mín. 3 "
+#~ "caracteres)"
+
 #~ msgid ""
 #~ "There is {0} additional primitive referred to by relation {1}<br>which is "
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 22626)
+++ applications/editors/josm/i18n/po/et.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 12:48+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 18:14+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -122,6 +122,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -226,4 +226,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -235,4 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -242,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -297,5 +299,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Katkesta"
@@ -361,4 +363,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -417,5 +420,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1366,5 +1369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1429,4 +1432,51 @@
 msgid "Preferences"
 msgstr "Eelistused"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Purge..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "Liida"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+msgid "Confirm Purging"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "lisa valikusse"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1468,4 +1518,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1702,4 +1753,5 @@
 msgstr "Palun vali lihtsustamiseks vähemalt üks tee."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1707,4 +1759,5 @@
 #: ../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 "Jah"
@@ -1753,8 +1806,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Valik ei ole lahutamiseks sobiv."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2911,4 +2963,5 @@
 
 #. 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
@@ -2938,5 +2991,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3146,5 +3199,5 @@
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 
@@ -3176,10 +3229,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3189,4 +3237,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3565,5 +3619,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3573,6 +3627,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3582,10 +3636,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3593,5 +3649,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3600,5 +3656,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3606,4 +3662,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3900,5 +3964,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr ""
@@ -4172,69 +4236,69 @@
 msgstr "Salasõna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4244,9 +4308,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4254,45 +4318,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Varaste lIsandprogrammidl laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Loon kasutajaliidest"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "LIsandprogrammide  laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4301,14 +4365,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Fail"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4327,10 +4407,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Vaade"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4338,5 +4418,5 @@
 msgstr "Tööriistad"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4344,5 +4424,5 @@
 msgstr "Eelseaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4353,5 +4433,5 @@
 msgstr "Menüü: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Heli"
@@ -4449,17 +4529,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Teenindus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "Muutustekogumid"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Kommerts"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5167,5 +5244,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "kõik"
@@ -5802,5 +5879,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Seosed"
@@ -5894,10 +5971,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6497,4 +6574,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6956,5 +7035,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6998,111 +7076,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nimi"
@@ -8134,21 +8213,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8157,10 +8240,10 @@
 "URL lehelt www.openstreetmap.org (saad kleepida siia allalaetava ala URL''i)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Ümbritsev kast"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8169,15 +8252,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8322,8 +8405,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr ""
@@ -8352,6 +8435,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "tundmatu"
@@ -8924,7 +9007,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9233,12 +9318,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Revisjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Jätka"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9264,7 +9347,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Rohkem ei näidata"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9447,5 +9529,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9626,5 +9708,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr ""
@@ -11243,5 +11325,5 @@
 msgstr "Värvid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11252,35 +11334,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11288,5 +11370,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11308,5 +11390,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11348,5 +11430,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11360,63 +11442,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Joonista suuna nooled"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11424,9 +11513,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11434,34 +11523,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11469,13 +11558,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11483,9 +11572,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11493,54 +11582,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr ""
@@ -12747,5 +12836,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14306,5 +14395,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14331,5 +14420,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14573,5 +14662,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr ""
@@ -15020,5 +15109,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Ehitised"
@@ -15255,5 +15344,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17817,10 +17906,11 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Vali jalatsi pood"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
 msgstr ""
@@ -18897,5 +18987,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -20846,5 +20936,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr ""
@@ -21383,5 +21473,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21394,5 +21484,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "mets"
@@ -21670,4 +21760,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21696,9 +21848,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr ""
@@ -21808,9 +21991,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr ""
@@ -22234,5 +22448,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "matkamine"
@@ -22267,5 +22481,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22279,5 +22493,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22406,4 +22628,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22435,14 +22665,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operaatorfirma"
@@ -22704,12 +22938,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr ""
@@ -23561,5 +23795,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Pinge"
@@ -23871,6 +24105,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -23922,32 +24158,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Avatud"
@@ -23956,4 +24192,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24006,174 +24243,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24203,7 +24440,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr ""
@@ -24219,5 +24456,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr ""
@@ -24230,6 +24467,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr ""
@@ -24405,5 +24642,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr ""
@@ -24440,6 +24677,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr ""
@@ -24447,5 +24684,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr ""
@@ -24564,5 +24801,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -24622,11 +24859,241 @@
 msgstr ""
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "lennuterminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefoninumber"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr ""
@@ -24634,20 +25101,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr ""
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr ""
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr ""
@@ -24655,10 +25122,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr ""
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr ""
@@ -24666,30 +25133,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr ""
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr ""
@@ -24697,10 +25164,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Toit ja jook"
@@ -24711,5 +25178,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restoran"
@@ -24717,11 +25184,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr ""
@@ -24729,78 +25196,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "kohalik"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -24808,17 +25276,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kohvik"
@@ -24826,9 +25306,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pubi"
@@ -24836,19 +25317,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr ""
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Baar"
@@ -24856,9 +25338,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -24866,24 +25349,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Muuseum"
@@ -24891,9 +25375,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -24902,9 +25386,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr ""
@@ -24912,24 +25396,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Teemapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr ""
@@ -24937,5 +25421,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr ""
@@ -24943,19 +25427,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Infopunkt"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -24993,5 +25477,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24999,28 +25483,28 @@
 msgstr "tänav"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25030,5 +25514,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25036,5 +25520,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Matkamine"
@@ -25042,6 +25526,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr ""
@@ -25049,5 +25533,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25055,6 +25539,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -25062,5 +25546,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25068,46 +25552,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25116,5 +25600,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25122,29 +25606,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr ""
@@ -25152,25 +25636,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Lõkkease"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Piknikuplats"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Ajaloolised kohad"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Loss"
@@ -25179,19 +25663,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr ""
@@ -25200,9 +25684,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr ""
@@ -25210,10 +25694,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25221,5 +25705,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25227,15 +25711,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -25243,55 +25727,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -25299,35 +25783,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr ""
@@ -25341,6 +25825,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -25756,6 +26240,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -25790,240 +26274,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "kanuu"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "suusatamine"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "jalgpall"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "lauatennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Miniatuurne golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Mitu"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26065,23 +26549,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "tüüp"
@@ -26123,211 +26607,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Kergejõustik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Vibusport"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr ""
@@ -26335,52 +26819,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "mägi"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "murdmaa"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "lumepark"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -26388,204 +26872,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "Golfiväljak"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Vali kriket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Hoone"
@@ -26593,5 +27077,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Avalik hoone"
@@ -26599,10 +27083,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Raekoda"
@@ -26610,10 +27094,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Vali raekoda"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Saatkond"
@@ -26621,10 +27105,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -26633,10 +27117,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Vangla"
@@ -26645,10 +27129,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Politsei"
@@ -26658,10 +27142,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -26670,10 +27154,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Postkontor"
@@ -26681,5 +27165,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr ""
@@ -26687,15 +27171,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Kool"
@@ -26703,10 +27187,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Ülikool"
@@ -26714,10 +27198,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Kolledž"
@@ -26725,5 +27209,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Vali kolledž"
@@ -26731,5 +27215,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Kino"
@@ -26738,10 +27222,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Raamatukogu"
@@ -26750,9 +27234,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr ""
@@ -26760,10 +27244,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teater"
@@ -26772,10 +27256,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -26785,5 +27269,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Vali palvekoht"
@@ -26792,6 +27276,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religioon"
@@ -26800,66 +27284,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -26868,81 +27352,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "šiia"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Aadressid"
@@ -26951,5 +27435,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -26957,5 +27441,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Maja number"
@@ -26963,25 +27447,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Riigi kood"
@@ -26990,5 +27474,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -26996,61 +27480,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "paaris"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Töökojad"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27058,25 +27542,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -27084,10 +27568,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -27095,10 +27579,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Torustik"
@@ -27107,41 +27591,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gaas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "õli"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr ""
@@ -27151,10 +27635,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Kraana"
@@ -27162,5 +27646,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Vali kraana"
@@ -27168,10 +27652,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -27179,10 +27663,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -27190,23 +27674,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -27216,35 +27700,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hüdro"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "tuuma"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "päikeseenergia"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -27253,10 +27737,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Vali elektrijaam"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -27265,5 +27749,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -27271,10 +27755,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr ""
@@ -27285,23 +27769,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr ""
@@ -27310,20 +27794,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Joonetüüp"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27331,55 +27815,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "üksik"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "topelt"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "kolmekordne"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Teenused"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Tualetid"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefon"
@@ -27388,5 +27872,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr ""
@@ -27394,5 +27878,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Mündid"
@@ -27400,5 +27884,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Märkused"
@@ -27406,5 +27890,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27412,5 +27896,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -27418,15 +27902,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Krediitkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -27435,5 +27919,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -27441,35 +27925,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27477,5 +27961,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27484,31 +27968,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Materjal"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "kivi"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plastikust"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Värv"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "must"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "pruun"
@@ -27587,5 +28071,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27595,31 +28079,31 @@
 msgstr "roheala"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "punane"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "sinine"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "hall"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "valge"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
@@ -27628,30 +28112,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Peida"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Lukusta"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Purskaev"
@@ -27660,10 +28144,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -27672,10 +28156,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Vali joogivee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27684,5 +28168,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27690,5 +28174,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -27696,15 +28180,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27712,10 +28196,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27724,28 +28208,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -27753,9 +28237,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Vali nurgakauplus"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27763,27 +28247,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Lihunik"
@@ -27791,9 +28275,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Vali lihunik"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Pagar"
@@ -27801,9 +28285,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Vali pagar"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Lilleseadja"
@@ -27811,18 +28295,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Vali lilleseadja"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Ökokaubad"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Redigeeri ökopoodi"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -27830,54 +28314,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Redigeeri alkoholi poode"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Joogipood"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Arvuti"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Vali arvutipood"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Vali elektroonika pood"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Vali mööblipood"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Aiakeskus"
@@ -27885,9 +28369,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Vali aiakeskus"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Riistvara"
@@ -27895,9 +28379,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Vali riistvara pood"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27905,54 +28389,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Vali kirjatarvete pood"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Vali juuksur"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Vali jalatsi pood"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Vali video pood"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Kuiir puhastus"
@@ -27960,9 +28444,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Vali kiirpuhastus"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -27970,9 +28454,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Vali pesumaja"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -27980,24 +28464,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Vali välisukse pood"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Vali spordi pood"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Vali optika"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr ""
@@ -28005,5 +28489,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr ""
@@ -28011,97 +28495,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "kondoomid"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Pank"
@@ -28109,14 +28593,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Vali Pank"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Rahavahetus"
@@ -28124,5 +28608,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Vali rahavahetuse punkt"
@@ -28130,15 +28614,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Arstid"
@@ -28146,18 +28630,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -28165,5 +28649,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -28171,9 +28655,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Retseptuur"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Haigla"
@@ -28181,10 +28665,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -28193,5 +28677,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -28200,20 +28684,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Punkti nimi"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefoninumber"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28221,5 +28700,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -28228,64 +28707,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geograafia"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Asukohad"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Vali maa"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Riik"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Regioon"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Maakond"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -28293,15 +28772,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Linn"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Linn"
@@ -28309,10 +28788,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -28320,25 +28799,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Muuda küla/alevik/alev"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Muuda küla"
@@ -28346,5 +28825,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -28352,10 +28831,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Saar"
@@ -28363,10 +28842,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Muuda saart"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28374,5 +28853,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28380,5 +28859,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -28386,10 +28865,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Mäetipp"
@@ -28397,10 +28876,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Liustik"
@@ -28408,10 +28887,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -28419,70 +28898,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Riiklikud"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Üksik puu"
@@ -28491,15 +28970,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Mets"
@@ -28508,5 +28987,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -28514,17 +28993,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -28533,14 +29012,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -28548,25 +29027,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Langus"
@@ -28574,10 +29053,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Nõmm"
@@ -28585,5 +29064,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -28591,5 +29070,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -28598,45 +29077,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -28644,25 +29123,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Aed"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Muru"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Külatanum"
@@ -28670,10 +29149,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Avalik maa"
@@ -28681,20 +29160,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -28702,5 +29181,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -28708,15 +29187,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -28724,9 +29203,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -28734,39 +29213,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Raudtee"
@@ -28774,15 +29253,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militaarala"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -28790,50 +29269,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
@@ -28843,5 +29322,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -28853,5 +29332,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "väline osa"
@@ -28859,5 +29338,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "siseosa"
@@ -28865,5 +29344,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -28874,5 +29353,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -28880,36 +29359,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -28917,5 +29396,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -28924,5 +29403,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -28930,34 +29409,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -28966,15 +29445,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "üle sõlme või tee"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "teele"
@@ -28982,5 +29461,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Teekond"
@@ -28989,5 +29468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -28995,5 +29474,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -29101,5 +29580,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29110,17 +29589,17 @@
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "suusad"
@@ -29188,5 +29667,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29196,9 +29675,9 @@
 msgstr "jalgsi"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "ümbersõit"
@@ -29212,10 +29691,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -29223,31 +29702,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -29256,30 +29735,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
@@ -30457,16 +30936,4 @@
 msgstr "aeronautika"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "lennuterminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33388,9 +33855,4 @@
 #~ msgstr "Lae OSMi serverisse"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Valitud tee ei sisalda valitud sõlme"
-#~ msgstr[1] "Valitud tee ei sisalda valitud sõlmi"
-
 #~ msgid "Move"
 #~ msgstr "Liiguta"
@@ -33630,4 +34092,9 @@
 #~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun "
 #~ "teata sellest veast arendajaid."
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Valitud tee ei sisalda valitud sõlme"
+#~ msgstr[1] "Valitud tee ei sisalda valitud sõlmi"
 
 #~ msgid "Found <member> element in non-relation."
Index: applications/editors/josm/i18n/po/eu.po
===================================================================
--- applications/editors/josm/i18n/po/eu.po	(revision 22626)
+++ applications/editors/josm/i18n/po/eu.po	(revision 22628)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
 "PO-Revision-Date: 2010-07-06 17:47+0000\n"
 "Last-Translator: Mikel Lizarralde <mlizarralde@tagzania.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -122,6 +122,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -232,4 +232,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -241,4 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -248,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -303,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Utzi"
@@ -369,4 +371,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -425,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1406,5 +1409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1476,4 +1479,51 @@
 msgid "Preferences"
 msgstr "Hobespenak"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Purge..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hanburgesategia"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+msgid "Confirm Purging"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "gehitu aukeraketara"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1515,4 +1565,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1752,4 +1803,5 @@
 msgstr "Mesedez, aukera ezazu gutxienez bide bat sinplifikatzeko."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1757,4 +1809,5 @@
 #: ../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 "Bai"
@@ -1804,8 +1857,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Egungo aukeraketa ezin da erabili bereizketarako."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3056,4 +3108,5 @@
 
 #. 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
@@ -3083,5 +3136,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "Ados"
@@ -3298,7 +3351,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Osatugabeko objektuak ezabatzear zaude.<br>Honek arazoak sor ditzake ez "
@@ -3332,10 +3386,5 @@
 msgstr[1] "Mugitu {0} nodoak"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "''{0}'' objektua ezabatua"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3345,4 +3394,10 @@
 msgstr[1] "''{0}'' objektuak ezabatuak"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "''{0}'' objektua ezabatua"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3753,5 +3808,5 @@
 "Ezin izan da jatorrizko {0}-a gehitu datu-multzora beronen barne delako jada"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3764,6 +3819,6 @@
 "de . Hau ez da errore garrantzitsu bat, beraz zure lanean jarrai dezakezu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3773,10 +3828,12 @@
 msgstr "Galdu egin da {0} ID-a duen bidearen ageriko helburua"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Galdu egin da {0} ID-a duen objektuaren ageriko helburua"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3784,5 +3841,5 @@
 msgstr "Galdu egin da {0} ID-a duen nodoaren ageriko helburua"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3791,5 +3848,5 @@
 msgstr "Galdu egin da {0} ID-a duen erlazioaren ageriko helburua"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3798,4 +3855,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Galdu egin da {1} ID-a duen {0} motako ageriko helburua"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4104,5 +4169,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "trenbidea"
@@ -4377,29 +4442,29 @@
 msgstr "Pasahitza"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "erabilera"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "aukerak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Erakutsi laguntza hau"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Unixeko geometria argumento estandarra"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Deskargatu inguru-koadroa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Deskargatu URL-ean zehaztutako tokia (lat=x&lon=y&zoom=z erabiliz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4407,9 +4472,9 @@
 "Ireki aukerarekin)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Deskargatu inguru-koadroa gps datu gordin moduan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4417,33 +4482,33 @@
 "gordin moduan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Aukeratu emandako bilaketarekin"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Abiarazi modu maximizatuan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Preferentziak jatorrizkora berrezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Hizkuntza ezarri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "aukera hauek Java-ren sistema propietate moduan ematen dira"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/JOSM/KARPETARA/BIDEA/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Erabiltzailearen hobespen guztientzat karpeta aldatu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4457,9 +4522,9 @@
 "megabytetan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "adibideak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4469,46 +4534,46 @@
 "prozesatzen dira."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "--selection erabiltzen baduzu, ziurtatu zenbait datu kargatzen dituzula."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Hasieratzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Pluginak eguneratzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Eguneratutako pluginak instalatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Hasierako pluginak kargatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Hobespen orijinalak ezartzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "GUI nagusia sortzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Pluginak kargatzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4517,14 +4582,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "{0} hobespena ezabatu dugu ez bait da jadanik erabiltzen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Fitxategia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4543,10 +4624,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Ikusi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4554,5 +4635,5 @@
 msgstr "Tresnak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4560,5 +4641,5 @@
 msgstr "Aurrezarpenak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4569,5 +4650,5 @@
 msgstr "Menua: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audioa"
@@ -4667,17 +4748,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Zerbitzu-bidea"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "txinatarra"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Bulegoak"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5422,5 +5500,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "denak"
@@ -6058,5 +6136,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Erlazioak"
@@ -6150,10 +6228,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6753,4 +6831,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7212,5 +7292,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7254,111 +7333,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Izena"
@@ -8390,21 +8470,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8412,10 +8496,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8424,15 +8508,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8577,8 +8661,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr ""
@@ -8607,6 +8691,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr ""
@@ -9181,7 +9265,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9490,12 +9576,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Alderantzikatu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Jarraitu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9703,5 +9787,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9882,5 +9966,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr ""
@@ -11495,5 +11579,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11504,35 +11588,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11540,5 +11624,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11560,5 +11644,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11600,5 +11684,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11612,64 +11696,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Egilea"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesela"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11677,9 +11767,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11687,34 +11777,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11722,13 +11812,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11736,9 +11826,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11746,54 +11836,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr ""
@@ -13000,5 +13090,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14557,5 +14647,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14582,5 +14672,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14817,5 +14907,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr ""
@@ -15264,5 +15354,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Eraikinak"
@@ -15499,5 +15589,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17444,7 +17534,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "Konbinatutako bertsioa"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18062,10 +18151,11 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Zapata-denda editatu"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
 msgstr ""
@@ -19142,5 +19232,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipoligonoa"
@@ -21184,5 +21274,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Erreferentzia"
@@ -21721,5 +21811,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "metala"
@@ -21732,5 +21822,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "egurra"
@@ -22008,4 +22098,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22034,9 +22186,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "bai"
@@ -22146,9 +22329,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "ez"
@@ -22572,5 +22786,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "xenda"
@@ -22605,5 +22819,5 @@
 msgstr "ona"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "ertaina"
@@ -22617,5 +22831,13 @@
 msgstr "oso txarra"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Gurpil-aulkiak"
@@ -22744,4 +22966,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22773,14 +23003,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operadorea"
@@ -23042,12 +23276,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Garaiera"
@@ -23899,5 +24133,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Tentsioa"
@@ -24209,6 +24443,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24260,32 +24496,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Irekiera-ordutegia"
@@ -24294,4 +24530,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24344,174 +24581,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Astelehenetik ostiralera 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Asteartetik Igandera 08:00-15:00; Larunbatetan 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr "Kioskoarekin"
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Erregai motak"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesela"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Biodiesela"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Kamioi handientzako diesela"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "91 oktano"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "95 oktano"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "98 oktano"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "100 oktano"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (%10eko etanol nahastea)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (%85eko etanol nahastea)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPF (Petroliotik likidotutako gasa)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Konprimitutako Gas Naturala)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr "Kioskoarekin"
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24541,7 +24779,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Erreferentzia zenbakia"
@@ -24557,5 +24795,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "lurrazpian"
@@ -24568,6 +24806,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Ordainpekoa"
@@ -24743,5 +24981,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Gurpildun aulkia"
@@ -24778,6 +25016,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Babeslekua"
@@ -24785,5 +25023,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Jarlekua"
@@ -24902,5 +25140,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Baliza"
@@ -24960,11 +25198,241 @@
 msgstr "Hotela editatu"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Izarrak"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminala"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefono Zenbakia"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motela"
@@ -24972,20 +25440,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Motela editatu"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Pentsioa"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Pentsioa editatu"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Bungalowa"
@@ -24993,10 +25461,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Bungalowa editatu"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Aterpetxea"
@@ -25004,30 +25472,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Aterpetxea editatu"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Mediko aterpea"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Mendiko aterpea editatu"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Karabanentzako kanpalekua"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Karabanentzako kanpalekua editatu"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Kanpalekua"
@@ -25035,10 +25503,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Kanpalekua editatu"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Janaria+Edariak"
@@ -25049,5 +25517,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Jatetxea"
@@ -25055,11 +25523,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Jatetxea editatu"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Sukaldaritza"
@@ -25067,78 +25535,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "txinatarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizzeria"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hanburgesategia"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "greziarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "alemaniarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "bertakoa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turkiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thailandiarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexikarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japoniarra"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "frantsesa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "sandwich-a"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi-a"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Otordu lasterreko jatetxea"
@@ -25146,17 +25615,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Otordu lasterreko jatetxea editatu"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "fish and chips (arraina eta pataten jatetxea)"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "oilaskoa"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kafetegia"
@@ -25164,9 +25645,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Kafetegia editatu"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -25174,19 +25656,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Pub-a editatu"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Biergarten-a editatu"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Taberna"
@@ -25194,9 +25677,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Taberna editatu"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Diskoteka"
@@ -25204,24 +25688,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Diskoteka editatu"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turismoa"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Erakarpena"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Erakarpena editatu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museoa"
@@ -25229,9 +25714,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Museoa editatu"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -25240,9 +25725,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Zooa editatu"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Ikuspegi-gunea"
@@ -25250,24 +25735,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Ikuspegi-gunea editatu"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Zelata-dorrea"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Jolas-parkea"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Jolas-parkea editatu"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Artelana"
@@ -25275,5 +25760,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Artelana editatu"
@@ -25281,19 +25766,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Informazio bulegoa"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Xehetasun-maila"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topografiko"
@@ -25331,5 +25816,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25337,28 +25822,28 @@
 msgstr "kalea"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "eskema"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Erakutsitako ingurua"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "gunea"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "hiria"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "erregioa"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Deskribapen zehatzagoa"
@@ -25368,5 +25853,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Erakutsitako bideak:"
@@ -25374,5 +25859,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Mendi-ibiliak"
@@ -25380,6 +25865,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Txirrindularitza"
@@ -25387,5 +25872,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Mendi-bizikleta"
@@ -25393,6 +25878,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Eskia"
@@ -25400,5 +25885,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Zaldiketa"
@@ -25406,54 +25891,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... beste garraio mota batzuk aukeran"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Informazio-panela"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Iragarki-taula"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "oharra"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "basa-bizitza"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "landareak"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Informazio-zutoina"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "postea"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Informazio-gunea"
@@ -25461,29 +25945,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Deskribapen zehatza"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audiogida"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Telefono mugikor bidezko audiogida?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Telefono zenbakia"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Beste informazio gune batzuk"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Aterpea editatu"
@@ -25491,25 +25975,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Barbakoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Piknik-gunea"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Piknik-gunea editatu"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Gune historikoak"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Gaztelua"
@@ -25518,19 +26002,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Gaztelua editatu"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Hondakinak"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Hondakinak editatu"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Gune-arkeologikoa"
@@ -25539,9 +26023,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Gune-arkeologikoa editatu"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Gudu-zelaia"
@@ -25549,10 +26033,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Gudu-zelaia editatu"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Gune-paleontologikoa"
@@ -25560,5 +26044,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Gune-paleontologikoa editatu"
@@ -25566,15 +26050,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monumentua"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Monumentua editatu"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Oroitarria"
@@ -25582,55 +26066,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Oroitarria editatu"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Gurutzadura"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Gurutzadura editatu"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Santutxoa"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Santutxoa editatu"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Mugarria"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Mugarria editatu"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Aisia"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Ur-jolasen parkea"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Ur-jolasen parkea editatu"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Jolastokia"
@@ -25638,35 +26122,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Jolastokia editatu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Arrantza"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Arrantza editatu"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Kirolak"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Kirol-instalazioak"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Estadioa"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Estadioa editatu"
@@ -25680,6 +26164,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "aukeratu kirola:"
@@ -26095,6 +26579,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26129,240 +26613,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "arku-tiroa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletismoa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "futbol australiarra"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "beisbola"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "saskibaloia"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "bola-jokoa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "alpinismoa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricketa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "Saredun-cricketa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "croqueta"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "txirrindularitza"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "txakur-lasterketa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "hipika"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golfa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hockeya"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "zaldi-lasterketa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motorra"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "euskal pilota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "erraketa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skate-a"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "patinajea"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "eskia"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "futbola"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "igeriketa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "ping-pong-a"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tenisa"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Kiroldegia"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Kiroldegia editatu"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Kirol-zelaia"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Kirol-zelaia editatu"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Lasterketa-pista"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Lasterketa-pista editatu"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golf-zelaia"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Golf-zelaia editatu"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolfa"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Minigolfa editatu"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Kirola"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Multi"
@@ -26404,23 +26888,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "mota"
@@ -26462,211 +26946,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "zelaia"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "kiroldegia"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "estadioa"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Bola-jokoa"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Bola-jokoa editatu"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletismoa"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Atletismoa editatu"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Arku-tiroa"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Arku-tiroa editatu"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Alpinismoa"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Alpinismoa editatu"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Piraguismoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Piraguismoa editatu"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Txirrindularitza editatu"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Txakur-lasterketak"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Txakur-lasterketak editatu"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Hipika"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Hipika editatu"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Zaldi-lasterketak"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Zaldi-lasterketak editatu"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Gimnasia editatu"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motor-kirolak"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Motor-kirolak"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Patinajea"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Patinajea editatu"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skate-a"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Skate-parkea editatu"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Igeriketa"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Igeriketa editatu"
@@ -26674,52 +27158,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Eskia editatu"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Eski-pista mota"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "jaitsiera"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "nordikoa"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "snowboard parkea"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Zailtasuna"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "hasiberria"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "erraza"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "aurreratua"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "aditua"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "pistatik kanpo"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Tiro"
@@ -26727,204 +27211,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Tiro-a editatu"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Kirolak (pilota-kirolak)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Futbola"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Futbola editatu"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Futbol australiarra"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Futbol australiarra editatu"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Beisbola"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Beisbola editatu"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Saskibaloia"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Saskibaloia editatu"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golfa"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Golfa editatu"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golf-zelaia"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boulea"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Boulea editatu"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bola-jokoa"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Bola-jokoa editatu"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket-a"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Cricket-a editatu"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Saredun-cricket-a"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Saredun-cricket-a editatu"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet-a"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Croquet-a editatu"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey-a"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Hockey-a editatu"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Frontoia (Euskal pilota)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Frontoia (Euskal pilota) editatu"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Erraketa"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Erraketa editatu"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Ping-pong-a editatu"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Tenisa editatu"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Gizakiak-eraikia"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Eraikina"
@@ -26932,5 +27416,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Eraikin-publikoa"
@@ -26938,10 +27422,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Eraikin-publikoa editatu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Udaletxea"
@@ -26949,10 +27433,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Udaletxea editatu"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Enbaxada"
@@ -26960,10 +27444,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Enbaxada editatu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Epaitegia"
@@ -26972,10 +27456,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Epaitegia editatu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Gartzela"
@@ -26984,10 +27468,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Gartzela editatu"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Polizia"
@@ -26997,10 +27481,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Polizia editatu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Suhiltzaile-etxea"
@@ -27009,10 +27493,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Suhiltzaile-etxea editatu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Postetxea"
@@ -27020,5 +27504,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Postetxea-editatu"
@@ -27026,15 +27510,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Haurreskola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Haurreskola editatu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Eskola"
@@ -27042,10 +27526,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Eskola editatu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Unibertsitatea"
@@ -27053,10 +27537,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Unibertsitatea editatu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Batxilergo-eskola"
@@ -27064,5 +27548,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Batxilergo-eskola editatu"
@@ -27070,5 +27554,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Zinema"
@@ -27077,10 +27561,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Zinema editatu"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Liburutegia"
@@ -27089,9 +27573,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Liburutegia editatu"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Arte zentrua"
@@ -27099,10 +27583,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Arte zentrua editatu"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Antzokia"
@@ -27111,10 +27595,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Antzokia editatu"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Gurtze-lekua"
@@ -27124,5 +27608,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Gurtze-lekua editatu"
@@ -27131,6 +27615,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Erlijioa"
@@ -27139,66 +27623,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahaista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "kristaua"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindua"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "judu"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "musulman"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sij"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrika"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Sinesmena"
@@ -27207,81 +27691,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katoliko"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "ebanjeliko"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "Jehovaren lekukoak"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormoi"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentekostal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "kuakero"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "xii"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "suni"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Helbideak"
@@ -27290,5 +27774,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Helbideak editatu"
@@ -27296,5 +27780,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Eraikinaren atari zenbakia"
@@ -27302,25 +27786,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Eraikinaren izena"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Kale-izena"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Hiriaren izena"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Posta-kodea"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Estatuaren kodea"
@@ -27329,5 +27813,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Helbideen Interpolazioa editatu"
@@ -27335,61 +27819,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Zenbakien-eskema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "bakoitia"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "bikoitia"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alfabetiko"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Gizakiak eraikia"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Lantokia"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Lantokia editatu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Dorrea"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Dorrea editatu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Dorre mota"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "komunikazioa"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "behaketa"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Altuera (metrotan)"
@@ -27397,25 +27881,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Ur-dorrea"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Ur-dorrea editatu"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Gasometroa"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Itsasargia"
@@ -27423,10 +27907,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Itsasargia editatu"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Haize-errota"
@@ -27434,10 +27918,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Haize-errota editatu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Hodiak"
@@ -27446,41 +27930,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Hodiak editatu"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gasa"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "termikoa"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "olioa"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "hondakin-ura"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "edozein substantzia"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Kokapena"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "urperatua"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "lurrazalean"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Hondakin-uren araztegia editatu"
@@ -27490,10 +27974,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Hondakin-uren araztegia editatu"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Garabia"
@@ -27501,5 +27985,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Garabia editatu"
@@ -27507,10 +27991,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Baliza editatu"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Erpin geodesikoa"
@@ -27518,10 +28002,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Erpin geodesikoa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Zaintza-kamera"
@@ -27529,23 +28013,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Zaintza-kamera editatu"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "barruko"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "kanpoko"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "publikoa"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Energia-sorgailua"
@@ -27555,35 +28039,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Energia sorgailua editatu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "haizea"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hidrauliko"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nuklear"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "ikatza"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "fotovoltaiko"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Zentral elektrikoa"
@@ -27592,10 +28076,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Zentral elektrikoa editatu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Azpiestazio elektrikoa"
@@ -27604,5 +28088,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Azpiestazio elektrikoa editatu"
@@ -27610,10 +28094,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Linearen erreferentzia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Elektrizitate-dorrea"
@@ -27624,23 +28108,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Elektrizitate-dorrea editatu"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "dorrea"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "postea"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Dorrearen erreferentzia"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Linea elektrikoa"
@@ -27649,20 +28133,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Linea elektrikoa editatu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Linea mota"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27670,55 +28154,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Kable kopurua"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Alanbre kopurua (eroale hobea) kable elektriko bakoitzeko"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "bakuna"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "bikoitza"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "hirukoitza"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Zerbitzuak"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Komunak"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "mugatua"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Oharra"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Gutunontzia"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefonoa"
@@ -27727,5 +28211,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Telefonoa editatu"
@@ -27733,5 +28217,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Txanponak"
@@ -27739,5 +28223,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Oharrak"
@@ -27745,5 +28229,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Errekarga-txartelak eta diru-zorro elektronikoak"
@@ -27751,5 +28235,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Debitu-txartelak"
@@ -27757,15 +28241,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kreditu-txartelak"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefono-txartelak"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Birziklapena"
@@ -27774,5 +28258,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Birziklatze-gunea editatu"
@@ -27780,35 +28264,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Bateria"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Ontziak"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Arropak"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Beira"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papera"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Txatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Paperontzia"
@@ -27816,5 +28300,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Paperontzia editatu"
@@ -27823,31 +28307,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Aulkiaren bizkarraldea"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Materiala"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "harria"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plastikoa"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Kolorea"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "beltza"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "marroia"
@@ -27926,5 +28410,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27934,31 +28418,31 @@
 msgstr "berdea"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "gorria"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "urdina"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "grisa"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "zuria"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Jarleku kopurua"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Ehiza-postua"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Ehiza-postua editatu"
@@ -27967,30 +28451,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Garaiera"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "baxua"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "erdia"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "beteta"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Esklusa"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Iturria"
@@ -27999,10 +28483,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Iturria editatu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Iturria (edateko ona)"
@@ -28011,10 +28495,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Iturria (edateko ona) editatu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Suteentzako hidrantea"
@@ -28023,5 +28507,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Suteentzako hidrantea editatu"
@@ -28029,5 +28513,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -28035,15 +28519,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Dendak"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Auto kontzesionarioa"
@@ -28051,10 +28535,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Auto kontzesionarioa editatu"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Bizikleta-denda"
@@ -28063,28 +28547,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Bizikleta-denda editatu"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermerkatua"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Supermerkatua editatu"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Botika"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Botika editatu"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Janari-denda"
@@ -28092,9 +28576,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Janari-denda editatu"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kioskoa"
@@ -28102,27 +28586,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Kioskoa editatu"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Liburudenda"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Liburudenda editatu"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Bidaia-agentzia"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Bidaia-agentzia editatu"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Harategia"
@@ -28130,9 +28614,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Harategia editatu"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Okindegia"
@@ -28140,9 +28624,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Okindegia editatu"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Loradenda"
@@ -28150,18 +28634,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Loradenda editatu"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Produktu organikoen denda"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Produktu organikoen denda"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alkohola"
@@ -28169,54 +28653,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Alkoholdun edarien denda editatu"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Edariak"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Edari-denda editatu"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Ordenagailua"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Ordenagailu-denda editatu"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Elektronika-denda editatu"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "HI-FI"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "HI-FI denda editatu"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Altzariak"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Altzari-denda editatu"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Lorezaintza zentrua"
@@ -28224,9 +28708,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Lorezaintza zentrua editatu"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Burdindegia"
@@ -28234,9 +28718,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Burdindegia editatu"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Brikolaje-denda"
@@ -28244,54 +28728,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Brikolaje denda editatu"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Paper-denda"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Paper-denda editatu"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Ileapaindegia"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Ileapaindegia editatu"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Zapatak"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Zapata-denda editatu"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Jostailuak"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Jostailu-denda editatu"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Bideoa"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Bideo-denda editatu"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Tindategia"
@@ -28299,9 +28783,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Tindategia editatu"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Garbitegia"
@@ -28309,9 +28793,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Garbitegia editatu"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Kanpoko aktibitateen denda"
@@ -28319,24 +28803,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Kanpoko aktibitateen denda editatu"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Kiroldenda editatu"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optika"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Optika editatu"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Makina-saltzailea"
@@ -28344,5 +28828,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Makina-saltzailea editatu"
@@ -28350,97 +28834,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Produktuen makina-saltzailea"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "garraio publikoko txartelak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "garraio publikoaren mapak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "aparkalekuko txartelak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "Elikadura"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "edariak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "gozokiak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "zigarretak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "argazkiak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "animalientzako janaria"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "egunkariak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "jostailuak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "seiluak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM txartelak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "Telefono-txartelak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "Bonuak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "kondoiak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tanpoiak"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "gorotz-poltsa"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Fideltasun edo deskontu txartelak"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Dirua"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banku"
@@ -28448,14 +28932,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Bankua editatu"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Kutxazain automatikoa"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Diru-trukea"
@@ -28463,5 +28947,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Diru-trukea editatu"
@@ -28469,15 +28953,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Kutxazain automatikoa editatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Osasuna"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Medikuak"
@@ -28485,18 +28969,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Medikuak editatu"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Dentista editatu"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Botika"
@@ -28504,5 +28988,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Botika editatu"
@@ -28510,9 +28994,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Medikuaren errezetarekin saltzen dute"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Ospitalea"
@@ -28520,10 +29004,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Ospitalea editatu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua"
@@ -28532,5 +29016,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Larrieldietarako sarrera puntua editatu"
@@ -28539,20 +29023,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Puntu-zenbakia"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Puntuaren izena"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefono Zenbakia"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Erabili nazioarteko kodea, hala nola +12-345-67890)"
@@ -28560,5 +29039,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Albaitaria"
@@ -28567,64 +29046,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Albaitaria editatu"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Lekuak"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinentea"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Kontinentea editatu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Herrialdea"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Herrialdea editatu"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Estatua"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Estatua editatu"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Erregioa"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Erregioa editatu"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Eskualdea"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Eskualdea editatu"
@@ -28632,15 +29111,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Hiria (100.000 biztanle baino gehiago)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Hiria (100.000 biztanle baino gehiago) editatu"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Herria (10.000 - 100.000 biztanle)"
@@ -28648,10 +29127,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Herria (10.000 - 100.000 biztanle) editatu"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Auzoa"
@@ -28659,25 +29138,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Auzoa editatu"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Herria (10.000 biztale baino gutxiago)"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Herria (10.000 biztale baino gutxiago) editatu"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak)"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Auzoa (mendialdean eta egoten direnak) editatu"
@@ -28685,5 +29164,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Ingurua (leku geografikoa)"
@@ -28691,10 +29170,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Ingurua (leku geografikoa) editatu"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Irla"
@@ -28702,10 +29181,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Irla editatu"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Irlatxoa"
@@ -28713,5 +29192,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Irlatxoa editatu"
@@ -28719,5 +29198,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Kobazuloaren sarrera"
@@ -28725,10 +29204,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Kobazuloaren sarrera editatu"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Mendi-tontorra"
@@ -28736,10 +29215,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Mendi-tontorra editatu"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Glaziarra"
@@ -28747,10 +29226,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Glaziarra editatu"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Sumendia"
@@ -28758,70 +29237,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Sumendia editatu"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Mugak"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Nazionala"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Muga nazionala editatu"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administratiboa"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Muga administratiboa editatu"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Zibila"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Muga zibila editatu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Politikoa"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Muga politikoa editatu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Parke nazionala"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Parke nazionala editatu"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Lurzorua"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Zuhaitza"
@@ -28830,15 +29309,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Zuhaitza editatu"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Izen-botanikoa"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Basoa"
@@ -28847,5 +29326,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Basoa editatu"
@@ -28853,17 +29332,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "konifero"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "hostoerorkorra"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "misto"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Basoa"
@@ -28872,14 +29351,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Basoa editatu"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Natura-erreserba"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Natura-erreserba editatu"
@@ -28887,25 +29366,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Harritza"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Harritza editatu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Sastraka"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Sastraka editatu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -28913,10 +29392,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Txilardi"
@@ -28924,5 +29403,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Txilardia editatu"
@@ -28930,5 +29409,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Etxaldea"
@@ -28937,45 +29416,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Etxalde-gunea editatu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Nekazaritza-lurra"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Nekazaritza-lurrak editatu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Belardia"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Mahastia"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Mahastia editatu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Soroak"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Soroak editatu"
@@ -28983,25 +29462,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Lorategia"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Lorategia editatu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Belarra"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Belardia editatu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Udal-parkea"
@@ -29009,10 +29488,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Udal-parkea editatu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Amankomuna"
@@ -29020,20 +29499,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Amankomuna editatu"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Parkea"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Parkea editatu"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Aisialdi-gunea"
@@ -29041,5 +29520,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Aisialdi-gunea editatu"
@@ -29047,15 +29526,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Bizitegi-gunea"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Bizitegi-gunea editatu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Hilerria (txikia)"
@@ -29063,9 +29542,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Hilerria (txikia) editatu"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Hilerria"
@@ -29073,39 +29552,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Hilerria editatu"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Merkataritza"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Merkataritza-gunea editatu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Bulegoak"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Bulego-eremua editatu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industriala"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Industrialdea editatu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Trenbide-eremua"
@@ -29113,15 +29592,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Trenbide-eremua editatu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militarra"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Eremu militarra editatu"
@@ -29129,50 +29608,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Eraikitze-eremua"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Eraikitze-eremua editatu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Lugorria"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Lugorria editatu"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Eraikitzeko lurzorua"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Eraikitzeko lurzorua editatu"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Zabortegia"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Editatu zabortegia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Harrobia"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Harrobia editatu"
@@ -29182,5 +29661,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Multipoligonoa editatu"
@@ -29192,5 +29671,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "kanpoko segmentua"
@@ -29198,5 +29677,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "barruko segmentua"
@@ -29204,5 +29683,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Muga"
@@ -29213,5 +29692,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Muga editatu"
@@ -29219,36 +29698,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Muga mota"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "administratiboa"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "nazionala"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "zibila"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "politikoa"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Maila administratiboa"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "Azpi-area"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Administrazio gunea"
@@ -29256,5 +29735,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Biraketa debekua"
@@ -29263,5 +29742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Biraketa debekua editatu"
@@ -29269,34 +29748,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Debekua"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "ezkerrera biratzea debekatua"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "eskuinera biratzea debekatua"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "zuzen jarraitzea debekatua"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "U biraketa egitea debekatua"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "soilik eskuinera biratzea"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "soilik ezkerrera biratzea"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "aurrerantz soilik"
@@ -29305,15 +29784,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "norabide honetatik"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "nodo edo bide honetan zehar"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "bide honetara"
@@ -29321,5 +29800,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Bidea"
@@ -29328,5 +29807,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Bidea editatu"
@@ -29334,5 +29813,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Bide mota"
@@ -29440,5 +29919,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29449,17 +29928,17 @@
 msgstr "bizikleta"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "autobusa"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "errepidea"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ski"
@@ -29527,5 +30006,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29535,9 +30014,9 @@
 msgstr "oinezkoa"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tranbia"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "desbideratzea"
@@ -29551,10 +30030,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metroa"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Sinboloaren deskribapena"
@@ -29562,31 +30041,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Sarea"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Estatuko bidea"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "proposatutako"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "txandakatu"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "behin-behineko"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "lotura"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Kolorea (hex)"
@@ -29595,30 +30074,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "ibilbidearen segmentua"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "hurrengo segmentua"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "aurreko segmentua"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "geldialdi puntua"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "hurrengo geldialdi puntua"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "aurreko geldialdi puntua"
@@ -30796,16 +31275,4 @@
 msgstr "aireko bidea"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminala"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33732,4 +34199,7 @@
 #~ msgstr "Graduak Minutuak Segundoak"
 
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Galdu egin da {0} ID-a duen objektuaren ageriko helburua"
+
 #~ msgid "Football"
 #~ msgstr "Futbol amerikarra"
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 22626)
+++ applications/editors/josm/i18n/po/fi.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 11:51+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 21:41+0000\n"
 "Last-Translator: Mika Laari <laari@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -228,4 +228,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -237,4 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -299,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Peruuta"
@@ -365,4 +367,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -421,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1391,5 +1394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1456,4 +1459,53 @@
 msgid "Preferences"
 msgstr "Asetukset"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Valmistellaan..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hampurilainen"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Muokkaa liitännäissivustoja"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "lisää valintaan"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1495,4 +1547,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1730,4 +1783,5 @@
 msgstr "Valitse vähintään yksi polku jonka haluat yksinkertaistaa."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1735,4 +1789,5 @@
 #: ../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 "Kyllä"
@@ -1781,8 +1836,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Valintaa ei voida käyttää jakamiseen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3016,4 +3070,5 @@
 
 #. 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
@@ -3043,5 +3098,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3257,7 +3312,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Poistettavana on keskeneräisiä kohteita.<br>Siitä seuraa ongelmia, koska "
@@ -3291,10 +3347,5 @@
 msgstr[1] "Siirrä {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Kohde \"{0}\" tuhottiin"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3304,4 +3355,10 @@
 msgstr[1] "Tuhottiin {0} kohdetta"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Kohde \"{0}\" tuhottiin"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3709,5 +3766,5 @@
 msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3721,6 +3778,6 @@
 "ongelmitta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3730,10 +3787,12 @@
 msgstr "Polulta numero {0} puuttuu yhdistämiskohde"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Kohteelta numero {0} puuttuu yhdistämiskohde"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3741,5 +3800,5 @@
 msgstr "Solmulta numero {0} puuttuu yhdistämiskohde"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3748,5 +3807,5 @@
 msgstr "Relaatio id = {0} puuttuu kohdejoukosta"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3755,4 +3814,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Kohteelta, jonka tyyppi on {0} ja numero {1}, puuttuu yhdistämiskohde"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4058,5 +4125,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "rata"
@@ -4330,69 +4397,69 @@
 msgstr "Salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "käyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "valinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Näytä tämä ohje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "UNIX-standardin mukainen geometria"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Lataa rajattu alue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Avaa tiedosto (mitä tahansa Tiedosto/Avaa-valikon tuntemaa tyyppiä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Lataa rajattu alue raaka-GPS:nä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Lataa URLissa annettu alue (lat=x&lon=y&zoom=z) raaka-GPS:nä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Valitse haun tulokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Käynnistä suurennettuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Palauta oletusasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Aseta kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "Javan järjestelmäominaisuuksina näkyvät asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/polku/josmin/hakemistoon/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Vaihda kaikkien käyttäjäasetuksien kansio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4405,9 +4472,9 @@
 "Java-asetus, joka määrää suurimman käytettävän muistimäärän megatavuina."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "esimerkkejä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4417,45 +4484,45 @@
 "järjestyksessä."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Muista ladata dataa, jos käytät --selection-valitsinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Alustetaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Päivitetään liitännäisiä..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Asennetaan päivitetyt liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Ladataan liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4464,14 +4531,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Asetus {0} on poistettu koska sitä ei enää tarvita."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4490,10 +4573,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Näytä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4501,5 +4584,5 @@
 msgstr "Työkalut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4507,5 +4590,5 @@
 msgstr "Esivalinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4516,5 +4599,5 @@
 msgstr "Valikko: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Ääni"
@@ -4618,12 +4701,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "kiinalainen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Toimistoalue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5369,5 +5450,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "kaikki"
@@ -6020,5 +6101,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relaatiot"
@@ -6112,10 +6193,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Valitse relaatioluettelosta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Valitse relaatio relaatioluettelosta"
@@ -6718,4 +6799,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7177,5 +7260,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7219,111 +7301,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nimi"
@@ -8384,21 +8467,25 @@
 msgstr "Nimeä valitut kirjanmerkit uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8408,10 +8495,10 @@
 "tähän ladataksesi alueen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Rajoittava alue"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8420,15 +8507,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8574,8 +8661,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Tyyppi"
@@ -8604,6 +8691,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "tuntematon"
@@ -9011,7 +9098,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Virheellinen kommentti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9205,7 +9291,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9516,17 +9604,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Virheellinen kommentti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Käännä järjestys"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Jatka"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9552,7 +9637,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Älä näytä uudelleen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9751,5 +9835,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9934,5 +10018,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Kuvaus"
@@ -11562,5 +11646,5 @@
 msgstr "Värit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11571,35 +11655,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Pakota viivojen piirto, jos segmenttejä ei ole."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Piirrä isot GPS-pisteet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Piirrä ympyrä HDOP-arvosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Nopeus (punainen = hidas, vihreä = nopea)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Paikannuksen tarkkuus (punainen = huono, vihreä = hyvä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
@@ -11607,5 +11691,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11627,5 +11711,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11667,5 +11751,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11679,64 +11763,70 @@
 msgstr "Jalankulku (foot)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Piirrä suuntanuolet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Nopea piirto (näyttää rumemmalta)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Piirrä segmenttien järjestysnumerot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Piirrä ladatun alueen rajat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Piirrä virtuaalipisteet valintatilassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Piirrä epäaktiiviset tasot eri värillä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Pehmeä karttagrafiikka (antialisointi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Tekijä"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Vene"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11744,9 +11834,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11756,9 +11846,9 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11767,20 +11857,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11788,5 +11878,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11794,13 +11884,13 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11810,9 +11900,9 @@
 "tason ominaisuuksista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Värittää pisteet ja jäljen segmentit nopeuden mukaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11820,46 +11910,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Nopeusvärityksen valinta eri keskinopeuksille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "WayPoint-kuva"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS-pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Piirrä suuntanuolet polkujen segmenteille."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Piirrä polkujen segmenteille järjestysnumerot."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11867,9 +11956,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Piirrä epäaktiiviset tasot eri värillä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -12238,7 +12327,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Taso, jolla tehdään mittaukset"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13089,5 +13177,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14685,5 +14773,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14710,5 +14798,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14952,5 +15040,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -15399,5 +15487,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Rakennukset"
@@ -15634,5 +15722,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17595,7 +17683,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "Yhdistetty versio"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18215,13 +18302,12 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
-#, fuzzy
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+msgid "Edit SeaMap Symbols"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Erotin"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19302,5 +19388,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr ""
@@ -21271,5 +21357,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Numero"
@@ -21808,5 +21894,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21819,5 +21905,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "metsä"
@@ -22095,4 +22181,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22121,9 +22269,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "kyllä"
@@ -22233,9 +22412,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "ei"
@@ -22659,5 +22869,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22692,5 +22902,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22704,5 +22914,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22831,4 +23049,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22860,14 +23086,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operaattori"
@@ -23129,12 +23359,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Korkeus"
@@ -23986,5 +24216,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Jännite"
@@ -24296,6 +24526,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24347,32 +24579,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -24381,4 +24613,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24431,174 +24664,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24628,7 +24861,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr ""
@@ -24644,5 +24877,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "maanalainen"
@@ -24655,6 +24888,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Maksu"
@@ -24830,5 +25063,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -24865,6 +25098,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr ""
@@ -24872,5 +25105,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Penkki"
@@ -24989,5 +25222,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Loisto"
@@ -25047,11 +25280,241 @@
 msgstr "Muokkaa hotellia"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminaali"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Puhelinnumero"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motelli"
@@ -25059,20 +25522,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -25080,10 +25543,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr ""
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Hostelli"
@@ -25091,30 +25554,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr ""
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -25122,10 +25585,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -25136,5 +25599,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -25142,11 +25605,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr ""
@@ -25154,78 +25617,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -25233,17 +25697,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kahvila"
@@ -25251,9 +25727,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr ""
@@ -25261,19 +25738,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr ""
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr ""
@@ -25281,9 +25759,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -25291,24 +25770,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museo"
@@ -25316,9 +25796,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -25327,9 +25807,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -25337,24 +25817,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Taideteos"
@@ -25362,5 +25842,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr ""
@@ -25368,19 +25848,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25418,5 +25898,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25424,28 +25904,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25455,5 +25935,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25461,5 +25941,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr ""
@@ -25467,6 +25947,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -25474,5 +25954,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25480,6 +25960,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr ""
@@ -25487,5 +25967,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25493,46 +25973,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25541,5 +26021,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25547,29 +26027,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr ""
@@ -25577,25 +26057,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Linna"
@@ -25604,19 +26084,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -25625,9 +26105,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -25635,10 +26115,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25646,5 +26126,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25652,15 +26132,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -25668,55 +26148,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -25724,35 +26204,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Liikunta"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Liikuntapaikka"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -25766,6 +26246,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -26181,6 +26661,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26215,240 +26695,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskusta"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26490,23 +26970,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "tyyppi"
@@ -26548,211 +27028,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr ""
@@ -26760,52 +27240,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Ammunta"
@@ -26813,204 +27293,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Keinotekoiset"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Rakennus"
@@ -27018,5 +27498,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -27024,10 +27504,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -27035,10 +27515,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -27046,10 +27526,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -27058,10 +27538,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Vankila"
@@ -27070,10 +27550,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Poliisiasema"
@@ -27083,10 +27563,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -27095,10 +27575,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -27106,5 +27586,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -27112,15 +27592,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Koulu"
@@ -27128,10 +27608,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Yliopisto"
@@ -27139,10 +27619,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Korkeakoulu"
@@ -27150,5 +27630,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -27156,5 +27636,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -27163,10 +27643,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Kirjasto"
@@ -27175,9 +27655,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -27185,10 +27665,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teatteri"
@@ -27197,10 +27677,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr ""
@@ -27210,5 +27690,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr ""
@@ -27217,6 +27697,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Uskonto"
@@ -27225,66 +27705,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr ""
@@ -27293,81 +27773,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -27376,5 +27856,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -27382,5 +27862,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Talon numero"
@@ -27388,25 +27868,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Kadunnimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Maakoodi"
@@ -27415,5 +27895,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -27421,61 +27901,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27483,25 +27963,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -27509,10 +27989,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -27520,10 +28000,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Putki"
@@ -27532,41 +28012,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -27576,10 +28056,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Nosturi"
@@ -27587,5 +28067,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
@@ -27593,10 +28073,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr ""
@@ -27604,10 +28084,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -27615,23 +28095,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr ""
@@ -27641,35 +28121,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr ""
@@ -27678,10 +28158,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -27690,5 +28170,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -27696,10 +28176,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -27710,23 +28190,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -27735,20 +28215,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27756,55 +28236,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Käymälä"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Puhelin"
@@ -27813,5 +28293,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -27819,5 +28299,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Kolikot"
@@ -27825,5 +28305,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr ""
@@ -27831,5 +28311,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27837,5 +28317,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr ""
@@ -27843,15 +28323,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -27860,5 +28340,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -27866,35 +28346,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27902,5 +28382,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27909,31 +28389,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -28012,5 +28492,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28020,31 +28500,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -28053,30 +28533,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Lähde"
@@ -28085,10 +28565,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -28097,10 +28577,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -28109,5 +28589,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28115,5 +28595,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -28121,15 +28601,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -28137,10 +28617,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -28149,28 +28629,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -28178,9 +28658,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kioski"
@@ -28188,27 +28668,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Matkatoimisto"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Muokkaa matkatoimistoa"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -28216,9 +28696,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Leipomo"
@@ -28226,9 +28706,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr ""
@@ -28236,18 +28716,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr ""
@@ -28255,54 +28735,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr ""
@@ -28310,9 +28790,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr ""
@@ -28320,9 +28800,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -28330,54 +28810,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -28385,9 +28865,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Pesula"
@@ -28395,9 +28875,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr ""
@@ -28405,24 +28885,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Muokkaa urheiluvälinekauppaa"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -28430,5 +28910,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -28436,97 +28916,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "julkisen liikenteen lippuja"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "julkisen liikenteen aikatauluja"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Pankki"
@@ -28534,14 +29014,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -28549,5 +29029,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -28555,15 +29035,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -28571,18 +29051,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -28590,5 +29070,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -28596,9 +29076,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Sairaala"
@@ -28606,10 +29086,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr ""
@@ -28618,5 +29098,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28625,20 +29105,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Puhelinnumero"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28646,5 +29121,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -28653,64 +29128,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Maantiede"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Paikat"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Osavaltio"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr ""
@@ -28718,15 +29193,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Suurkaupunki"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Muokkaa suurkaupungin ominaisuuksia"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Kaupunki"
@@ -28734,10 +29209,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -28745,25 +29220,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -28771,5 +29246,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr ""
@@ -28777,10 +29252,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Saari"
@@ -28788,10 +29263,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28799,5 +29274,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28805,5 +29280,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -28811,10 +29286,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Huippu"
@@ -28822,10 +29297,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -28833,10 +29308,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -28844,70 +29319,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Puu"
@@ -28916,15 +29391,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Metsä"
@@ -28933,5 +29408,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -28939,17 +29414,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -28958,14 +29433,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28973,25 +29448,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Tunturi"
@@ -28999,10 +29474,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Nummi"
@@ -29010,5 +29485,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -29016,5 +29491,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -29023,45 +29498,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -29069,25 +29544,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -29095,10 +29570,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr ""
@@ -29106,20 +29581,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr ""
@@ -29127,5 +29602,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29133,15 +29608,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -29149,9 +29624,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -29159,39 +29634,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -29199,15 +29674,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -29215,50 +29690,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
@@ -29268,5 +29743,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29278,5 +29753,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr ""
@@ -29284,5 +29759,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr ""
@@ -29290,5 +29765,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29299,5 +29774,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29305,36 +29780,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29342,5 +29817,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr ""
@@ -29349,5 +29824,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29355,34 +29830,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr ""
@@ -29391,15 +29866,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr ""
@@ -29407,5 +29882,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr ""
@@ -29414,5 +29889,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr ""
@@ -29420,5 +29895,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr ""
@@ -29526,5 +30001,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29535,17 +30010,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29613,5 +30088,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29621,9 +30096,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29637,10 +30112,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29648,31 +30123,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr ""
@@ -29681,30 +30156,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30882,16 +31357,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminaali"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33810,23 +34273,6 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Valittu polku ei sisällä valittua pistettä."
-#~ msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Asteina, minuutteina ja sekunteina"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
-
 #~ msgid "Unknown version"
 #~ msgstr "Tuntematon versio"
-
-#~ msgid "Preparing..."
-#~ msgstr "Valmistellaan..."
 
 #~ msgid "Uploading..."
@@ -33942,4 +34388,7 @@
 #~ msgid "Conflicting relation"
 #~ msgstr "Ristiriidassa oleva relaatio"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Asteina, minuutteina ja sekunteina"
 
 #~ msgid "different"
@@ -34004,4 +34453,9 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "Kaikki polut olivat tyhjiä"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Valittu polku ei sisällä valittua pistettä."
+#~ msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -34471,4 +34925,7 @@
 #~ "{0}, enimmäismäärä on {1}"
 
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "Ole hyvä ja anna kommentti muutoskokoelmalle (vähintään 3 merkkiä)"
+
 #~ msgid ""
 #~ "<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
@@ -34516,4 +34973,7 @@
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "ld > 0 vaadittu, saatiin {0}"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
 
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
@@ -34642,2 +35102,5 @@
 #~ msgid "Errors during Download"
 #~ msgstr "Virheitä latauksen aikana"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Kohteelta numero {0} puuttuu yhdistämiskohde"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 22626)
+++ applications/editors/josm/i18n/po/fr.po	(revision 22628)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-03 22:07+0000\n"
-"Last-Translator: François Blondel <Unknown>\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 21:58+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -24,6 +24,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -229,4 +229,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -238,4 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -245,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -300,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Annuler"
@@ -367,4 +369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -423,5 +426,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1403,5 +1406,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1470,4 +1473,53 @@
 msgid "Preferences"
 msgstr "Préférences"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Surveyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Confirmation"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "ajouter à la sélection"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1509,4 +1561,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1746,4 +1799,5 @@
 msgstr "Veuillez sélectionner au moins un chemin à simplifier."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1751,4 +1805,5 @@
 #: ../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 "Oui"
@@ -1797,8 +1852,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "La sélection ne peut pas être utilisée pour couper."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3050,4 +3104,5 @@
 
 #. 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
@@ -3077,5 +3132,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3294,7 +3349,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Vous êtes sur le point de supprimer des objets incomplets.<br>Cela posera "
@@ -3329,10 +3385,5 @@
 msgstr[1] "Déplacer {0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Objet purgé ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3342,4 +3393,10 @@
 msgstr[1] "{0} objets enlevés"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Objet purgé ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3757,5 +3814,5 @@
 "inclue"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3769,6 +3826,6 @@
 "travailler en toute sécurité."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3778,10 +3835,12 @@
 msgstr "Cible de fusion manquante pour le chemin avec l’identifiant {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Cible de fusion manquante pour l’objet avec l’identifiant {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3789,5 +3848,5 @@
 msgstr "Cible de fusion manquante pour le nœud avec l’identifiant {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3796,5 +3855,5 @@
 msgstr "Cible de fusion manquante pour la relation avec l’identifiant {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3803,4 +3862,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Cible de fusion manquante pour le type {0} avec l’identifiant {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4112,5 +4179,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "voie ferrée"
@@ -4388,29 +4455,29 @@
 msgstr "Mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "Options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Télécharger la zone délimitée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Télécharger le lieu se rapportant à l’URL (avec lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4418,9 +4485,9 @@
 "Fichier/Ouvrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Télécharger la zone délimitée en données GPS brutes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4428,34 +4495,34 @@
 "lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Sélectionner avec la recherche actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Lancer maximisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Rétablir les préférences par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Définissez la langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 "options disponibles en tant que fichiers de propriétés système pour Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Changer le répertoire pour tous les paramètres utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4468,9 +4535,9 @@
 "     pour spécifier la taille maximale de mémoire allouée en mégaoctets"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "exemples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4480,45 +4547,45 @@
 "cet ordre."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Assurez-vous de charger des données si vous utilisez --sélection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Initialisation"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Mise à jour des greffons..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Installation des greffons mis à jour"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Chargement des premiers greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Régalage des valeurs par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Création de l’interface graphique"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Chargement des greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "Restaurer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4527,14 +4594,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "L’option {0} a été supprimée car elle n’est plus utilisée."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Fichier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4553,10 +4636,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Affichage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4564,5 +4647,5 @@
 msgstr "Outils"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4570,5 +4653,5 @@
 msgstr "Pré-réglages"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4579,5 +4662,5 @@
 msgstr "Menu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4677,17 +4760,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Numérique"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "chinoise"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Zone de bureaux"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5446,5 +5526,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "all"
@@ -6118,5 +6198,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relations"
@@ -6210,10 +6290,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Sélectionner dans la liste des relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Sélectionnez une relation dans la liste des relations."
@@ -6829,4 +6909,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7288,5 +7370,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7330,111 +7411,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nom"
@@ -8558,21 +8640,25 @@
 msgstr "Renommer le marque-page"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8582,10 +8668,10 @@
 "télécharger)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Zone délimitée"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8594,15 +8680,15 @@
 msgstr "La chaîne ''{0}'' n'est pas une valeur double valide."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "La latitude doit être dans la plage [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "La longitude doit être dans la plage [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8756,8 +8842,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Type"
@@ -8786,6 +8872,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "inconnue"
@@ -9223,7 +9309,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Commentaire de l’envoi erroné"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9438,7 +9523,9 @@
 msgstr "Sélectionner un nom de fichier"
 
+#. 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 "Non"
@@ -9789,17 +9876,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Commentaire de l’envoi erroné"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Inverser"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Continuer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9817,7 +9901,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Annuler et revenir à l’éditeur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9826,7 +9909,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Ne plus voir ce message"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -10042,5 +10124,5 @@
 msgstr[1] "Envoi de {0} objets..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10240,5 +10322,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Description"
@@ -12033,5 +12115,5 @@
 msgstr "Couleurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12042,36 +12124,36 @@
 msgstr "Tous"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Fichiers locaux"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Aucun"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forcer les lignes si aucun segment n’est importé."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Dessiner de gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Dessiner un cercle d’après les valeurs HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Vitesse (rouge = lent, vert = rapide)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Atténuation de la précision (rouge = élevée, vert = faible, si disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Une seule couleur (personnalisable pour les calques nommés)"
@@ -12079,5 +12161,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12099,5 +12181,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12139,5 +12221,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12151,65 +12233,70 @@
 msgstr "Piéton"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Dessin rapide (moins joli)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Seulement pour les directions intéressantes (sens unique par exemple)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Seulement à l’extrémité du chemin."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Afficher l’ordre des segments"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Afficher les limites des données téléchargées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Afficher les nœuds virtuels dans le mode sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Afficher les calques inactifs sous une autre couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Appliquer un anticrénelage (anti-aliasing) sur la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Créer des marqueurs à la lecture du GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Auteur"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Gazole"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Bateaux"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12219,9 +12306,9 @@
 "l’ouverture d’un calque GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Dessiner des lignes entre les points GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12231,9 +12318,9 @@
 "Entrez ''-1'' pour tracer toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Longueur maximale des fichiers locaux (mètres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12242,10 +12329,10 @@
 "toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Longueur maximale (mètres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12254,5 +12341,5 @@
 "d’information sur les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -12260,5 +12347,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12267,5 +12354,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12275,13 +12362,13 @@
 "valeur l’une de l’autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Distance minimale (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Afficher de plus gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12291,9 +12378,9 @@
 "dans le Gestionnaire de calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Colorie les segments et les points en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12303,46 +12390,45 @@
 "précision (HDOP). Votre instrument doit enregistrer cette information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Permet de colorier la trace en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Colorier les traces et les points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Description du point"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Points GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Dessiner les flèches de direction pour les sections de chemin."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Afficher l’ordre de tous les segments des chemins."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Appliquer un anticrénelage aux contours de la carte."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Afficher les limites des données téléchargées depuis le serveur."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12351,9 +12437,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Afficher les calques de données inactifs sous une autre couleur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Données OSM"
@@ -12748,7 +12834,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Calque où faire des mesures"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13675,5 +13760,5 @@
 msgstr "Analyse de la réponse du serveur..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -15469,5 +15554,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15501,5 +15586,5 @@
 "important problème de configuration. JOSM va être arrêté."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15771,5 +15856,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -16285,5 +16370,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Bâtiments"
@@ -16540,5 +16625,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -18586,7 +18671,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "version choisie :"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -19218,13 +19302,13 @@
 msgstr "Bâtiments mitoyens"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Modifier un magasin de chaussures"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Séparateur"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20397,5 +20481,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygone"
@@ -22457,5 +22541,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Référence"
@@ -22994,5 +23078,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "métal"
@@ -23005,5 +23089,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "bois"
@@ -23281,4 +23365,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -23307,9 +23453,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "oui"
@@ -23419,9 +23596,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "non"
@@ -23845,5 +24053,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "randonnée"
@@ -23878,5 +24086,5 @@
 msgstr "bon"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "rouge"
@@ -23890,5 +24098,13 @@
 msgstr "horrible"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Fauteuils roulants"
@@ -24017,4 +24233,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -24046,14 +24270,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Compagnie"
@@ -24315,12 +24543,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Altitude"
@@ -25172,5 +25400,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Tension"
@@ -25482,6 +25710,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -25533,32 +25763,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
@@ -25567,4 +25797,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -25617,174 +25848,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24h/24 7j/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lun-Ven 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Mar-Dim 08:00-15:00 ; Sam 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Types de carburant :"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Gazole"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Biogazole"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Gazole de type GTL"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Gazole pour poids lourds"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "Indice d’octane de 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "Indice d’octane de 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "Indice d’octane de 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "Indice d’octane de 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (mélange à 10% d’éthanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (Superéthanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (Gaz de Pétrole Liquéfié)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GNV (Gaz Naturel pour Véhicules)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr "Mélange 1/25 (cyclomoteur)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "Mélange 1/50 (cyclomoteur)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25814,7 +26046,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Numéro de référence"
@@ -25830,5 +26062,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "souterraine"
@@ -25841,6 +26073,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Payant"
@@ -26016,5 +26248,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Fauteuils roulants"
@@ -26051,6 +26283,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Abri"
@@ -26058,5 +26290,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Banc"
@@ -26175,5 +26407,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Balise lumineuse"
@@ -26233,11 +26465,241 @@
 msgstr "Modifier un hôtel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Étoiles"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "aérogare"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Numéro de téléphone"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -26245,20 +26707,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Modifier un motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Chambre d’hôtes"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Modifier une chambre d’hôtes"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Chalet"
@@ -26266,10 +26728,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Modifier un chalet"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Auberge de jeunesse"
@@ -26277,30 +26739,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Modifier une auberge de jeunesse"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Refuge"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Modifier un refuge"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Site pour caravanes"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Modifier un site pour caravanes"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Camping"
@@ -26308,10 +26770,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Modifier un camping"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Restauration"
@@ -26322,5 +26784,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26328,11 +26790,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Modifier un restaurant"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -26340,78 +26802,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italienne"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "chinoise"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "grecque"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "allemande"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indienne"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "régionale"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thaïlandaise"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexicaine"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japonaise"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "française"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Fast-Food"
@@ -26419,17 +26882,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifier un fast-food"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "poisson et frites"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "poulet"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Café"
@@ -26437,9 +26912,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Modifier un café"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub (anglo-saxon)"
@@ -26447,19 +26923,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Modifier un pub (anglo-saxon)"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Modifier un biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -26467,9 +26944,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Modifier un bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -26477,24 +26955,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Modifier une boîte de nuit"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Modifier une attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Musée"
@@ -26502,9 +26981,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Modifier un musée"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -26513,9 +26992,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Modifier un zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -26523,24 +27002,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Modifier un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Parc d’attraction"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Modifier un parc d’attraction"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Œuvre d'art"
@@ -26548,5 +27027,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Modifier une œuvre d’art"
@@ -26554,19 +27033,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Office du Tourisme"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Carte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Niveau de détail"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "carte topographique"
@@ -26604,5 +27083,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26610,28 +27089,28 @@
 msgstr "rue"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "carte schématique"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Zone affichée"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "Site"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "Ville"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "Région"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Description"
@@ -26641,5 +27120,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Affichage des itinéraires de :"
@@ -26647,5 +27126,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Randonnée"
@@ -26653,6 +27132,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Cyclisme"
@@ -26660,5 +27139,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "VTT"
@@ -26666,6 +27145,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Ski"
@@ -26673,5 +27152,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Équitation"
@@ -26679,54 +27158,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "…autres modes de transport possibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Panneau d’informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Contenu du panneau"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "annonce"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "faune"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "flore"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Poteau indicateur"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "pylône"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Terminal d’informations"
@@ -26734,29 +27212,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Description"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Guide audio"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Guide audio par téléphone portable ?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Point d’information"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Modifier un abri"
@@ -26764,25 +27242,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Modifier un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Château"
@@ -26791,19 +27269,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Modifier un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Modifier des ruines"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -26812,9 +27290,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Modifier un site archéologique"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -26822,10 +27300,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Modifier un lieu de bataille"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Site paléontologique"
@@ -26833,5 +27311,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Modifier un site paléontologique"
@@ -26839,15 +27317,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Modifier un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Mémorial"
@@ -26855,55 +27333,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Modifier un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Modifier une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Modifier une chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Modifier une pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Modifier un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Terrain de jeux pour enfants"
@@ -26911,35 +27389,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Modifier un terrain de jeux pour enfants"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Modifier un lieu de pêche"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Terrains de sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stade"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Modifier un stade"
@@ -26953,6 +27431,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "Selectionnez un sport :"
@@ -27368,6 +27846,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27402,240 +27880,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "multisport"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "tir à l’arc"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "athlétisme"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "football americain"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "football australien"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "boulingrin"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "football canadien"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "escalade"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "filets de cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "cyclisme"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "course de chiens"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr "football gaélique"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gymnastique"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "course de chevaux"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "sport de raquettes"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr "ligue de rugby"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr "union de rugby"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "roller"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "natation"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "tennis de table"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Modifier un centre sportif"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Modifier un terrain de sport"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Modifier un circuit"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Modifier un terrain de golf"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Modifier un minigolf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sports"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Multisport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Modifier un terrain multisport"
@@ -27677,23 +28155,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "type"
@@ -27735,211 +28213,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "terrain"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "centre de sports"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "piste"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Modifier un bowling"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Modifier l’athlétisme"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Modifier le tir à l’arc"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Modifier l'escalade"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Modifier le canoë"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Modifier le cyclisme"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Modifier une course de chiens"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Équitation"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Modifier un sport équestre"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Modifier une course de chevaux"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Modifier la gymnastique"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Sport mécanique"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Modifier un sport mécanique"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Roller"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Modifier le roller"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Modifier le skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Natation"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Modifier la natation"
@@ -27947,52 +28425,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Type de ski"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "alpin"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "snowpark"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "noire"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "orange"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Tir sportif"
@@ -28000,204 +28478,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Modifier le tir sportif"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Sports de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Modifier le football"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Modifier le football australien"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Modifier le baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Modifier le basketball"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Modifier un parcours de golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Jeu de boules"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Modifier le jeu de boules"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Boulingrin"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Modifier le boulingrin"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Modifier le cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Modifier des filets de cricket"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Modifier le croquet"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Modifier le hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Modifier la pelote basque"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Sport de raquette"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Modifier un sport de raquette"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Modifier le tennis de table"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Modifier le tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Artificiel"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Bâtiment"
@@ -28205,5 +28683,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Bâtiment public"
@@ -28211,10 +28689,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Modifier un bâtiment public"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Mairie"
@@ -28222,10 +28700,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Modifier une mairie"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Ambassade"
@@ -28233,10 +28711,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Modifier une ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -28245,10 +28723,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Modifier un palais de justice"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Prison"
@@ -28257,10 +28735,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Modifier une prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Commissariat de police"
@@ -28270,10 +28748,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Modifier un commissariat de police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -28282,10 +28760,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Modifier une caserne de pompiers"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -28293,5 +28771,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Modifier un bureau de poste"
@@ -28299,15 +28777,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Modifier un jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "École"
@@ -28315,10 +28793,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Modifier une école"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Université"
@@ -28326,10 +28804,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Modifier une université"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -28337,5 +28815,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Modifier un établissement d’enseignement supérieur"
@@ -28343,5 +28821,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Cinéma"
@@ -28350,10 +28828,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Modifier un cinéma"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Bibliothèque"
@@ -28362,9 +28840,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Modifier une bibliothèque"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -28372,10 +28850,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Modifier un centre artistique"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Théâtre"
@@ -28384,10 +28862,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Modifier un théatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -28397,5 +28875,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Modifier un lieu de culte"
@@ -28404,6 +28882,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religion"
@@ -28412,66 +28890,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahaïsme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "bouddhisme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "christianisme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindouisme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jaïnisme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "judaïsme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikhisme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritualisme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoïsme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Dénomination"
@@ -28480,81 +28958,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglicanisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "catholicisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "évangélisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "témoins de Jehovah"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luthérianisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "méthodisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormonisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "orthodoxie"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentecôtisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbytérianisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestantisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "chiisme"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunnisme"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adresses"
@@ -28563,5 +29041,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Modifier l’adresse"
@@ -28569,5 +29047,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -28575,25 +29053,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Nom de la rue"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -28602,5 +29080,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Modifier une interpolation d’adresse"
@@ -28608,61 +29086,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Numérotation"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Usine"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Modifier une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Structure de grande hauteur"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Modifier une structure de grande hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Type de structure"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Hauteur (mètres)"
@@ -28670,25 +29148,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Modifier un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Modifier un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Phare"
@@ -28696,10 +29174,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Modifier un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -28707,10 +29185,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Modifier un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Canalisation"
@@ -28720,41 +29198,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Modifier une canalisation"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "turbine à gaz"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "chaleur"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "pétrole"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "égouts"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "toute substance"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Commune"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "sous-marine"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "aérienne"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -28764,10 +29242,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Modifier une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Grue"
@@ -28775,5 +29253,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Modifier une grue"
@@ -28781,10 +29259,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Modifier une balise lumineuse"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -28792,10 +29270,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Modifier un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -28803,23 +29281,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Modifier une caméra de surveillance"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "intérieur"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "extérieur"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -28829,35 +29307,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Modifier une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "éolienne"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hydroélectrique"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fossile"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nucléaire"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "solaire photovoltaïque"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Station électrique"
@@ -28866,10 +29344,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Modifier une station électrique"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -28878,5 +29356,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Modifier un transformateur électrique"
@@ -28884,10 +29362,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Référence de la ligne"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -28898,23 +29376,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Modifier un pylône électrique"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "pylônes"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "pylône"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Référence du pylône"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Ligne électrique"
@@ -28923,20 +29401,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Modifier une ligne électrique"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Type de ligne"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28944,55 +29422,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Nombre de conducteurs par câbles"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "simple"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "quadruple"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toilettes publiques"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limité"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Paiement"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Cabine téléphonique"
@@ -29001,5 +29479,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Modifier une cabine téléphonique"
@@ -29007,5 +29485,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Pièces"
@@ -29013,5 +29491,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Billets"
@@ -29019,5 +29497,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Porte-monnaie électronique"
@@ -29025,5 +29503,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -29031,15 +29509,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Cartes de crédit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Point de recyclage"
@@ -29048,5 +29526,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Modifier un point de recyclage"
@@ -29054,35 +29532,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Ferraille"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Poubelle"
@@ -29090,5 +29568,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Modifier une poubelle"
@@ -29097,31 +29575,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Dossier"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Matériau"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "pierre"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plastique"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Couleur"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "noir"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "marron"
@@ -29200,5 +29678,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -29208,31 +29686,31 @@
 msgstr "vert"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "rouge"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "bleu"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "blanc"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Nombre de places"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -29241,30 +29719,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "moyenne"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "grande"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Camouflé"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Verrouillé"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fontaine"
@@ -29273,10 +29751,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Modifier une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Point d’eau potable"
@@ -29285,10 +29763,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Modifier un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -29297,5 +29775,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Modifier une borne incendie"
@@ -29303,5 +29781,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Tour d’abandon"
@@ -29309,15 +29787,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Modifier une tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Commerce"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Concessionnaire automobile"
@@ -29325,10 +29803,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Modifier une concession"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Magasin de vélos"
@@ -29337,28 +29815,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Modifier un magasin de vélo"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Modifier un supermarché"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Droguerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Modifier une droguerie"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Épicerie"
@@ -29366,9 +29844,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Modifier une épicerie"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -29376,27 +29854,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Modifier un kiosque à journaux"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Librairie"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Modifier une librairie"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Agence de voyage"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Modifier une agence de voyage"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Boucherie"
@@ -29404,9 +29882,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Modifier une boucherie"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Boulangerie"
@@ -29414,9 +29892,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Modifier une boulangerie"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Fleuriste"
@@ -29424,18 +29902,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Modifier un fleuriste"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Magasin bio"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Modifier un magasin bio"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alcool"
@@ -29443,54 +29921,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Modifier un magasin d’alcool"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Modifier un magasin de boissons"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Informatique"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Modifier un magasin d’informatique"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Modifier un magasin d’électronique"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Modifier un magasin Hi-Fi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Modifier un magasin d’ameublement"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -29498,9 +29976,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Modifier une jardinerie"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -29508,9 +29986,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Modifier une quincaillerie"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Bricolage"
@@ -29518,54 +29996,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifier un magasin de bricolage"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Modifier une papeterie"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Salon de coiffure"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Modifier un salon de coiffure"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Chaussures"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Modifier un magasin de chaussures"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Jouets"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Modifier un magasin de jouets"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Modifier un vidéoclub"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -29573,9 +30051,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Modifier un pressing"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Laverie"
@@ -29583,9 +30061,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Modifier une laverie"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Sports en plein air"
@@ -29593,24 +30071,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Modifier un magasin de sports en plein air"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Modifier un magasin de sport"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Opticien"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Modifier un opticien"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -29618,5 +30096,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Modifier un distributeur automatique"
@@ -29624,97 +30102,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "tickets de transport public"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "plans de transport public"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "tickets de parking"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "nourriture"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "boissons"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "alimentation animale"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "journaux"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "timbres"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "cartes SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "bons téléphoniques"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr "Tunnel cyclable"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "préservatifs"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "sacs pour excrément"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banque"
@@ -29722,14 +30200,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Modifier une banque"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -29737,5 +30215,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Modifier un bureau de change"
@@ -29743,15 +30221,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Modifier un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Cabinet médical"
@@ -29759,18 +30237,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Modifier un cabinet médical"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Cabinet dentaire"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Modifier un cabinet dentaire"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -29778,5 +30256,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Modifier une pharmacie"
@@ -29784,9 +30262,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Dispensaire"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Hôpital"
@@ -29794,10 +30272,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Modifier un hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -29806,5 +30284,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Modifier un point d’accès d’urgence"
@@ -29813,20 +30291,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Nom du point"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Numéro de téléphone"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890)"
@@ -29834,5 +30307,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Cabinet vétérinaire"
@@ -29841,64 +30314,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Modifier un cabinet vétérinaire"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Géographie"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Lieux"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Modifier un continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Pays"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Modifier un pays"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Département"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Modifier un département"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Région"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Modifier une région"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Modifier un comté/canton"
@@ -29906,15 +30379,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Modifier une ville"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Ville de 10 000 à 100 000 habitants"
@@ -29922,10 +30395,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Modifier une ville"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Banlieue"
@@ -29933,25 +30406,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Modifier une banlieue"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Modifier un village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Modifier un hameau"
@@ -29959,5 +30432,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -29965,10 +30438,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Modifier un lieu-dit"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "île"
@@ -29976,10 +30449,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Modifier une île"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "îlot"
@@ -29987,5 +30460,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Modifier un îlot"
@@ -29993,5 +30466,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -29999,10 +30472,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Modifier une entrée de grotte"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Sommet"
@@ -30010,10 +30483,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Modifier un sommet"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Glacier"
@@ -30021,10 +30494,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Modifier un glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Volcan"
@@ -30032,70 +30505,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Modifier un volcan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Nationale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Modifier une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Modifier une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Modifier une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Électorale"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Modifier une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Parc national"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Modifier une frontière d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Arbre"
@@ -30104,15 +30577,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Modifier un arbre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Bois"
@@ -30121,5 +30594,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Modifier un bois"
@@ -30127,17 +30600,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "conifères"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "feuillus"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "conifères et feuillus"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Forêt"
@@ -30146,14 +30619,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Modifier une  forêt"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Modifier une réserve naturelle"
@@ -30161,25 +30634,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Modifier une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Modifier des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Talus"
@@ -30187,10 +30660,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Modifier un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Lande"
@@ -30198,5 +30671,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Modifier une lande"
@@ -30204,5 +30677,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Cour de ferme"
@@ -30211,45 +30684,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Modifier une cour de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Terre arable"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Modifier une terre arable"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Modifier une prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Modifier une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Modifier des jardins familiaux"
@@ -30257,25 +30730,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Jardin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Modifier un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Herbe"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Modifier une zone herborée"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Village green (anglo-saxon)"
@@ -30283,10 +30756,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Modifier un village green (anglo-saxon)"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Espace publique"
@@ -30294,20 +30767,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Modifier un espace publique"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Parc"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Modifier un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -30315,5 +30788,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifier une aire de jeux"
@@ -30321,15 +30794,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Modifier une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -30337,9 +30810,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Modifier un petit cimetière"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -30347,39 +30820,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Modifier un cimetière"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Zone de commerces"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Modifier une zone de commerces"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Zone de bureaux"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Modifier une zone de bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Modifier une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -30387,15 +30860,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Modifier une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Terrain militaire"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Modifier un terrain militaire"
@@ -30403,50 +30876,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Chantier"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Modifier un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Terrain vague"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Modifier un terrain vague"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Zone d’aménagement"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Modifier une zone d’aménagement"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Modifier une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Modifier une carrière"
@@ -30456,5 +30929,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -30466,5 +30939,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "segment extérieur"
@@ -30472,5 +30945,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -30478,5 +30951,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -30487,5 +30960,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -30493,36 +30966,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "civile"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "politique"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Niveau administrative"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Centre d'administration"
@@ -30530,5 +31003,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -30537,5 +31010,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -30543,34 +31016,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "Interdiction d’aller tout droit"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "Obligation d’aller tout droit"
@@ -30579,15 +31052,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "chemin d’origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "nœud ou chemin \"via\""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "au chemin"
@@ -30595,5 +31068,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Itinéraire"
@@ -30602,5 +31075,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Modifier un itinéraire"
@@ -30608,5 +31081,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Type d’itinéraire"
@@ -30714,5 +31187,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30723,17 +31196,17 @@
 msgstr "vélo"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ski"
@@ -30801,5 +31274,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30809,9 +31282,9 @@
 msgstr "chemin pour piétons"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "détour"
@@ -30825,10 +31298,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Symbole"
@@ -30836,31 +31309,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "État de l’itinéraire"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Couleur (hexadécimale)"
@@ -30869,30 +31342,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "segment d’itinéraire"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "point d’arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "point d’arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "point d’arrêt précédent"
@@ -32070,16 +32543,4 @@
 msgstr "aéroport"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "aérogare"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34998,21 +35459,4 @@
 msgstr "Sicile - Italie"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Le chemin sélectionné ne contient pas le nœud sélectionné."
-#~ msgstr[1] ""
-#~ "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Degrés Minutes Secondes"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Entrer un commentaire d’envoi (min. 3 caractères)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Veuillez entrer un commentaire sur ce groupe de modifications (minimum 3 "
-#~ "caractères)"
-
 #~ msgid "Move"
 #~ msgstr "Déplacer"
@@ -35356,4 +35800,7 @@
 #~ msgid "Rotate"
 #~ msgstr "Pivoter"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Degrés Minutes Secondes"
 
 #~ msgid "Conflicting relation"
@@ -35759,7 +36206,4 @@
 #~ msgstr "Pas d'intersection trouvée. Rien n'a été modifié."
 
-#~ msgid "Continue anyway"
-#~ msgstr "Continuer tout de même"
-
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Veuillez rapporter un billet à {0}"
@@ -36375,7 +36819,4 @@
 #~ msgstr "Gauss-Laborde Réunion 1947"
 
-#~ msgid "Confirmation"
-#~ msgstr "Confirmation"
-
 #~ msgid "Delete all"
 #~ msgstr "Tout supprimer"
@@ -36719,4 +37160,10 @@
 #~ msgstr "Utiliser tous leurs éléments"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Le chemin sélectionné ne contient pas le nœud sélectionné."
+#~ msgstr[1] ""
+#~ "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés."
+
 #~ msgid "Football"
 #~ msgstr "Football américain"
@@ -36737,4 +37184,12 @@
 #~ msgid "Non-Way in multipolygon."
 #~ msgstr "Objet n'étant pas un chemin dans le multipolygone"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Veuillez entrer un commentaire sur ce groupe de modifications (minimum 3 "
+#~ "caractères)"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Cible de fusion manquante pour l’objet avec l’identifiant {0}"
 
 #~ msgid ""
@@ -36743,4 +37198,7 @@
 #~ "Sélectionner automatiquement le premier calque WMS lors du téléchargement "
 #~ "du cadastre."
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Entrer un commentaire d’envoi (min. 3 caractères)"
 
 #~ msgid "Multipolygon inner way is outside."
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 22626)
+++ applications/editors/josm/i18n/po/gl.po	(revision 22628)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
 "PO-Revision-Date: 2010-07-28 13:21+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -229,4 +229,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -238,4 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -245,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -300,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Cancelar"
@@ -365,4 +367,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -421,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1400,5 +1403,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1467,4 +1470,53 @@
 msgid "Preferences"
 msgstr "Preferencias"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Preparando..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburguesería"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Configurar os sitios dos engadidos"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "engadir á selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1506,4 +1558,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1743,4 +1796,5 @@
 msgstr "Por favor escolla ao menos unha via para simplificar."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1748,4 +1802,5 @@
 #: ../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 "Sí"
@@ -1795,8 +1850,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "A selección actual non pode ser usada para a separación."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3021,4 +3075,5 @@
 
 #. 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
@@ -3048,5 +3103,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3264,8 +3319,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Estás a punto de borrar nodos que se atopan fora da área que descargaches."
+"<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
+"estar usandoos.<br>Queres borralos realmente?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3296,10 +3355,5 @@
 msgstr[1] "Mover {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Obxecto \"{0}\" purgado"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3309,4 +3363,10 @@
 msgstr[1] "Pugados {0} obxectos"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Obxecto \"{0}\" purgado"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3718,5 +3778,5 @@
 "incluido"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3729,6 +3789,6 @@
 "é un erro crítico, deberia ser seguro continuar no teu choio."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3738,10 +3798,12 @@
 msgstr "Non se atopou obxectivo para misturar a via con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Non se atopou obxectivo para misturar o obxecto con id {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3749,5 +3811,5 @@
 msgstr "Non se atopou obxectivo para misturar o nodo con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3756,5 +3818,5 @@
 msgstr "Non se atopou obxectivo para misturar a relación con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3763,4 +3825,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Non se atopa o obxectivo a misturar do tipo {0} con id {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4069,5 +4139,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "Vía férrea"
@@ -4341,29 +4411,29 @@
 msgstr "Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "opcións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Amosar esta axuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Argumento de xeometría unix estandar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Descargar a caixa de límites"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4371,41 +4441,41 @@
 "Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Descargar a caixa de límites como datos gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Descargar localozación na url (con lat=x&lon=y&zoom=z) como gps en crú"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Escoller coa busca indicada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Restablecer as preferencias ós valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Establecer a linguaxe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "opción dadas polas propiedades do sistema de Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/RUTA/Á/CARPETA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Cambiar o directorio para as configuración de todos os usuarios"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4419,9 +4489,9 @@
 "en megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4431,45 +4501,45 @@
 "orde."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Asegurate de que cargas algún dato se usas --selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Inicializando"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Actualizando  Plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Instalando plugins actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Cargando extensións anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Establecendo valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Creando Interface (GUI) principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Cargando extensións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4478,14 +4548,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "A opción de configuración {0} foi eliminada porque xa non se usa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4504,10 +4590,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4515,5 +4601,5 @@
 msgstr "Ferramentas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4521,5 +4607,5 @@
 msgstr "Axustes prestablecidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4530,5 +4616,5 @@
 msgstr "Menú: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4628,17 +4714,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Servizo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "chino"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Comercial"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5398,5 +5481,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "todo"
@@ -6073,5 +6156,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relacións"
@@ -6165,10 +6248,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Escoller na lista de relacións"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Escoller relación an lista de relacións."
@@ -6780,4 +6863,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7239,5 +7324,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7281,111 +7365,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nome"
@@ -8447,21 +8532,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "lat. min."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "lon. min."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "lat. max."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "lon. max."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8471,10 +8560,10 @@
 "área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Caixa Circundante"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8483,15 +8572,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8639,8 +8728,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr ""
@@ -8669,6 +8758,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "descoñecido"
@@ -9073,7 +9162,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Introduce o teu comentario"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9264,7 +9352,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9573,12 +9663,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Invertir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Continuar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9604,7 +9692,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Non amosar de novo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9787,5 +9874,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9966,5 +10053,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr ""
@@ -11610,5 +11697,5 @@
 msgstr "Cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11619,35 +11706,35 @@
 msgstr "Todo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Arquivos locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Ningún"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forzar liñas se non se importou ningún segmento."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Debuxar puntos GPS grandes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermello = lento, verde = rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color simple (pode ser personalizado para as capas con nome)"
@@ -11655,5 +11742,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11675,5 +11762,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11715,5 +11802,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11727,16 +11814,16 @@
 msgstr "Pé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Debuxar Frechas de Dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Debuxo rápido (peor resultado)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11745,49 +11832,54 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Só no extremo da vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Debuxar os números de orde dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Debuxar os límites dos datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Debuxar nodos virtuais no modo de selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Debuxar as capas inactivas en outra cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gráficos de mapa suaves (filtro antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "norte"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11797,9 +11889,9 @@
 "se abra unha capa GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Debuxar liñas entre puntos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11809,9 +11901,9 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Lonxitude máxima para os arquivos locais (metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11820,10 +11912,10 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Lonxitude máxima (metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11832,10 +11924,10 @@
 "de liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Debuxar frechas de dirección para as liñas, conectando puntos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11844,5 +11936,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11852,13 +11944,13 @@
 "da anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima (pixeles)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Debuxar puntos máis grandes para os puntos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11868,9 +11960,9 @@
 "personalizados no Xestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Cores, puntos e segmentos de trazado en función da velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11878,36 +11970,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Permite afinar o coloreado de trazados para diferentes velocidades medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Coloreado de Trazados e Puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Debuxar consellos de dirección para segmentos de vía."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Debuxar os números de orde de todos os segmentos dentro da súa liña."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -11916,10 +12008,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Debuxar os límites dos datos cargados dende o servidor."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11928,9 +12020,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Debuxar as capas de datos inactivas nunha cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -13142,5 +13234,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14776,5 +14868,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14802,5 +14894,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15045,5 +15137,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr ""
@@ -15493,5 +15585,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Construccións"
@@ -15736,5 +15828,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17695,7 +17787,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "versión final:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18314,13 +18405,13 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Editar zapatería"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Separador"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19416,5 +19507,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr ""
@@ -21420,5 +21511,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Referencia"
@@ -21957,5 +22048,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "metal"
@@ -21968,5 +22059,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "bosque"
@@ -22244,4 +22335,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22270,9 +22423,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "si"
@@ -22382,9 +22566,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "non"
@@ -22808,5 +23023,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "senda"
@@ -22841,5 +23056,5 @@
 msgstr "bon"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "intermedia"
@@ -22853,5 +23068,13 @@
 msgstr "pésima"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Sillas de rodas"
@@ -22980,4 +23203,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23009,14 +23240,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operador/a"
@@ -23278,12 +23513,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Elevación"
@@ -24135,5 +24370,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Voltaxe"
@@ -24445,6 +24680,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24496,32 +24733,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -24530,4 +24767,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24580,174 +24818,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr "Con tenda"
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Tipos de combustible:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas a líquido - diesel ultimate)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel para Vehiculos pesados"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "91 octanos"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "95 octanos"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "98 octanos"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "100 octanos"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (mezcla ao 10% de etanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (mezcla ao 85% de etanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GLP (Gas licuado do petróleo)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GCN(Gas Natural Comprimido)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 misturada (mofa/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 misturada (mofa/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr "Con tenda"
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24777,7 +25016,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -24793,5 +25032,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "subterráneo"
@@ -24804,6 +25043,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "De pago"
@@ -24979,5 +25218,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Cadeira de rodas"
@@ -25014,6 +25253,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Refuxio"
@@ -25021,5 +25260,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Banco"
@@ -25138,5 +25377,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Baliza"
@@ -25196,11 +25435,241 @@
 msgstr "Editar hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Estrelas"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Número de teléfono"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -25208,20 +25677,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Editar motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Cabaña ou bungalow"
@@ -25229,10 +25698,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Editar cabaña ou bungalow"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Albergue"
@@ -25240,30 +25709,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -25271,10 +25740,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -25285,5 +25754,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -25291,11 +25760,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Cociña"
@@ -25303,78 +25772,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "grego"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "rexional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "xaponés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "francés"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Comida rápida"
@@ -25382,17 +25852,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecemento de comida rápida"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "fish_and_chips (patacas e pescado fritos)"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "polo"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Cafetería"
@@ -25400,9 +25882,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -25410,19 +25893,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Editar pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -25430,9 +25914,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -25440,24 +25925,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museo"
@@ -25465,9 +25951,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -25476,9 +25962,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -25486,24 +25972,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Torre de vixía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Gráficos"
@@ -25511,5 +25997,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Editar traballo artístico"
@@ -25517,19 +26003,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topográfico"
@@ -25567,5 +26053,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25573,28 +26059,28 @@
 msgstr "rúa"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "lugar"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "cidade"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "rexión"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -25604,5 +26090,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Rutas mostradas para:"
@@ -25610,5 +26096,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Sendeiro"
@@ -25616,6 +26102,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -25623,5 +26109,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Bicicleta de montaña"
@@ -25629,6 +26115,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Esquí"
@@ -25636,5 +26122,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Equitación"
@@ -25642,54 +26128,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "...outro métodos de desprazamentos posibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "aviso"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "historial"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "vida salvaxe"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Poste identificador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "poste"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -25697,29 +26182,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Descripción detallada"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de teléfono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Outros Puntos de Información"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Editar refuxio"
@@ -25727,25 +26212,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Cheminea"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Castelo"
@@ -25754,19 +26239,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Editar castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Editar ruínas"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Lugar arqueolóxico"
@@ -25775,9 +26260,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueolóxico"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -25785,10 +26270,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Sitio paleontolóxico"
@@ -25796,5 +26281,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Editar sitio paleontolóxico"
@@ -25802,15 +26287,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -25818,55 +26303,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Cruceiro"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Editar cruceiro"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Camiño a santuario"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Editar camiño a santuario"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Perdra Histórica"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Editar Pedra histórica"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Zona de xogos"
@@ -25874,35 +26359,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Editar zona de xogos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Editar pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -25916,6 +26401,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "escoller deporte:"
@@ -26331,6 +26816,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26365,240 +26850,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "fútbol_americano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "fútbol_canadiense"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "carreira de cans"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr "fútbol_gaélico"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "ximnasia"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "carreira de cabalos"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr "liga_rugby"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr "rugby_union"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "patinaxe"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Cancha de xogo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Editar cancha de xogo"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Pista de carreiras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreiras"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Deportes"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Múltiple"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -26640,23 +27125,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "tipo"
@@ -26698,211 +27183,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "cancha de xogo"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Carreiras de cans"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Editar carreiras de cans"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Carreira de cabalos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Editar carreiras de caballos"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Ximnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Editar Ximnasia"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Patinaxe"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Editar patinaxe"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -26910,52 +27395,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Dificultade"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "fora da pista"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Tiro"
@@ -26963,204 +27448,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr "Futbol Americano"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr "Editar Fútbol Americano"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr "Fútbol_Canadiense"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr "Editar Fútbol Canadiense"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr "Fútbol Gaélico"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr "Editar Fútbol Gaélico"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr "Liga de Rugby"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr "Rugby Union"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr "Editar Rugby Union"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Críket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Edit críket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Críket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Editar críket con redes"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Ténis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Editar tenis de mesa"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Edificio"
@@ -27168,5 +27653,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Edificio público"
@@ -27174,10 +27659,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Casa do Concello"
@@ -27185,10 +27670,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Editar Casa do Concello"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Embaixada"
@@ -27196,10 +27681,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Xuzgado"
@@ -27208,10 +27693,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Editar xuzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Prisión"
@@ -27220,10 +27705,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Policía"
@@ -27233,10 +27718,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Parque de bombeiros"
@@ -27245,10 +27730,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Editar parque de bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -27256,5 +27741,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -27262,15 +27747,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Editar Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Escola"
@@ -27278,10 +27763,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Editar escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Universidade"
@@ -27289,10 +27774,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Editar universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Instituto"
@@ -27300,5 +27785,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Editar instituto"
@@ -27306,5 +27791,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Cine"
@@ -27313,10 +27798,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Biblioteca"
@@ -27325,9 +27810,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -27335,10 +27820,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teatro"
@@ -27347,10 +27832,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -27360,5 +27845,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -27367,6 +27852,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Relixión"
@@ -27375,66 +27860,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "cristian"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "xudía"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "musulmá"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Denominación"
@@ -27443,81 +27928,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evanxélico"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "testigos de Xenoveva"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Enderezos"
@@ -27526,5 +28011,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Editar enderezos"
@@ -27532,5 +28017,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Número de casa"
@@ -27538,25 +28023,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Nome da rúa"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Nome da cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Código do país"
@@ -27565,5 +28050,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Editar interpolación de direccións"
@@ -27571,61 +28056,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Feito polo home"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -27633,25 +28118,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Torre de auga"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Faro"
@@ -27659,10 +28144,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Muíño de vento"
@@ -27670,10 +28155,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Editar muíño de vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Tubería"
@@ -27682,41 +28167,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "augas residuais"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "calquer substancia"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Localización"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "sumerxido"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "na superficie"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -27726,10 +28211,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Grúa"
@@ -27737,5 +28222,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Editar grúa"
@@ -27743,10 +28228,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Vértice xeodésico"
@@ -27754,10 +28239,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Editar vértice xeodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Cámara de vixilancia"
@@ -27765,23 +28250,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vixilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "interiores"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "exteriores"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Xerador de enerxía"
@@ -27791,35 +28276,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Editar Xerador de Enerxía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "vento"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -27828,10 +28313,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -27840,5 +28325,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -27846,10 +28331,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Liña de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Torre de electricidade"
@@ -27860,23 +28345,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidade"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Referencia da torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -27885,20 +28370,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Tipo de liña"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27906,55 +28391,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Cantidade de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de arames (mellor:conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "sinxelo"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "dobre"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "cuadruple"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Servizos"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Buzón de Correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Teléfono"
@@ -27963,5 +28448,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -27969,5 +28454,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Moedas"
@@ -27975,5 +28460,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Anotacións"
@@ -27981,5 +28466,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Tarxeta de recarga e moedeitos electrónicos"
@@ -27987,5 +28472,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Tarxetas de débito"
@@ -27993,15 +28478,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Tarxetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Tarxetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Reciclaxe"
@@ -28010,5 +28495,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Editar punto limpo"
@@ -28016,35 +28501,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Papeleiras"
@@ -28052,5 +28537,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Editar papeleiras"
@@ -28059,31 +28544,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Respaldo"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "pedra"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "marrón"
@@ -28162,5 +28647,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28170,31 +28655,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "vermello"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "branco"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Numero de asentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Apostadeiro de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadeiro de caza"
@@ -28203,30 +28688,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Alto"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Agochar"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Bloquear"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fonte"
@@ -28235,10 +28720,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Editar fonte"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Auga potable"
@@ -28247,10 +28732,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Editar auga potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Hidrante contra incendios"
@@ -28259,5 +28744,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Editar hidrante contra incendios"
@@ -28265,5 +28750,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Caixa temperada"
@@ -28271,15 +28756,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Editar caixa temperada"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Tendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Concesionario de automóviles"
@@ -28287,10 +28772,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Tenda de bicicletas"
@@ -28299,28 +28784,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Editar tenda de bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Tenda de alimentación"
@@ -28328,9 +28813,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Editar tenda de alimentación"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Quiosco"
@@ -28338,27 +28823,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Editar quiosco"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Axencia de viaxes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Editar axencia de viaxes"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Carnicería"
@@ -28366,9 +28851,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Panadeiro"
@@ -28376,9 +28861,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Editar panadeiro"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Floristería"
@@ -28386,18 +28871,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Orgánico"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Editar tenda de productos orgánicos"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Tenda de bebidas alcohólicas"
@@ -28405,54 +28890,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Editar tenda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Brebaxes"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Editar tenda de brebaxes"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Ordenador"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Editar tenda de ordenadores"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Editar tenda de electrónica"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Editar tenda HIfi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Mobles"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Editar Moblería"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Centro de xardinería"
@@ -28460,9 +28945,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Editar centro de xardinería"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Ferretería"
@@ -28470,9 +28955,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Editar ferretería"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaxe"
@@ -28480,54 +28965,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaxe"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Perruqueria"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Editar perruquería"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Xoguetes"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Editar Xoguetería"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Vídeo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Editar tenda de vídeos"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -28535,9 +29020,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Lavandería"
@@ -28545,9 +29030,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Editar Lavandería"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Exteriores"
@@ -28555,24 +29040,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Editar tenda de exteriores"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Editar tenda de materiais deportivos"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Óptica"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -28580,5 +29065,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -28586,97 +29071,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "Billetes de transporte público"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "Bonos de transporte público"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "Tickets de aparcamento"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "comida para animais"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "Xornáis"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "xoguetes"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "Tarxetas SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "Tarxetas telefónicas"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr "tubo_de_bicicleta"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "gomas do pito"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampóns"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Tarxetas de afidelización ou de desconto"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Cartos en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banco"
@@ -28684,14 +29169,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Caixeiro automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Cambio de moeda"
@@ -28699,5 +29184,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moeda"
@@ -28705,15 +29190,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixeiro"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Médicos"
@@ -28721,18 +29206,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Editar médicos"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -28740,5 +29225,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia"
@@ -28746,9 +29231,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Expende baixo receta médica"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Hospital"
@@ -28756,10 +29241,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emerxencias"
@@ -28768,5 +29253,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emerxencias"
@@ -28775,20 +29260,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Número do punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Nome do Punto"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Número de teléfono"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -28796,5 +29276,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -28803,64 +29283,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Xeografía"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Estado"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Editar estado"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Rexión"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Editar rexión"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "País"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Editar país"
@@ -28868,15 +29348,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Cidade"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Editar cidade"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Vila"
@@ -28884,10 +29364,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Editar Vila"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Suburbio"
@@ -28895,25 +29375,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Editar suburbio"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Poboación"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Editar poboación"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Aldea"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Editar aldea"
@@ -28921,5 +29401,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Localidade"
@@ -28927,10 +29407,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Editar Localidade"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Illa"
@@ -28938,10 +29418,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Editar Illa"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Illote"
@@ -28949,5 +29429,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Editar Illote"
@@ -28955,5 +29435,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Entrada de cova"
@@ -28961,10 +29441,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cova"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Pico"
@@ -28972,10 +29452,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Glaciar"
@@ -28983,10 +29463,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Volcán"
@@ -28994,70 +29474,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Editar fronteira nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Editar fronteira administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Editar fronteira civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Política"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Editar fronteira política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Editar límites do parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Uso do chan"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Árbore"
@@ -29066,15 +29546,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Editar árbore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Nome botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Madeira"
@@ -29083,5 +29563,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -29089,17 +29569,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "decíduos"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Monte"
@@ -29108,14 +29588,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -29123,25 +29603,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Cantos"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Editar cantos"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Caída"
@@ -29149,10 +29629,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Editar Caída"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -29160,5 +29640,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -29166,5 +29646,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -29173,45 +29653,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Terra de labor"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Editar o uso da terra de labor"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Editar o uso do prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Editar o uso do viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Área cultivábel"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "eitar o uso da área cultivábel"
@@ -29219,25 +29699,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Xardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Editar Xardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Herba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Editar o uso ta área de herba"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Parque Municipal"
@@ -29245,10 +29725,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Común"
@@ -29256,20 +29736,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Editar común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Terra de recreo"
@@ -29277,5 +29757,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar o uso da área de recreo"
@@ -29283,15 +29763,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Editar o uso da área residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Camposanto (para os cementerios próximos ás igrexas)"
@@ -29299,9 +29779,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Cemiterio"
@@ -29309,39 +29789,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Editar a área do cemiterio"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Editar o uso da área comercial"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Editar o uso da área industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Via do tren"
@@ -29349,15 +29829,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Editar o uso da área da via do tren"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Editar o uso da área militar"
@@ -29365,50 +29845,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Área de construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Editar o uso da área en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Zona industrial abandoada"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno abandoado"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Zona verde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Editar zona verde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Vertedoiro"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedoiro"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Canteira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Editar o uso da área da canteira"
@@ -29418,5 +29898,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -29428,5 +29908,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "segmento exterior"
@@ -29434,5 +29914,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "segmento interior"
@@ -29440,5 +29920,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Límite"
@@ -29449,5 +29929,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Editar límite"
@@ -29455,36 +29935,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Tipo de límite"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "administrativo"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "nacional"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "civil"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "político"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Nivel administrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "Subárea"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Centro de Administración"
@@ -29492,5 +29972,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Restricción de xiro"
@@ -29499,5 +29979,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Editar as restriccións de xiro"
@@ -29505,34 +29985,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "non_xirar_esquerda"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "non_xirar_dereita"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "non_seguir_de_frente"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "prohibido xiro en U"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "só_xirar_dereita"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "só_xirar_esquerda"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "só_seguir_de_frente"
@@ -29541,15 +30021,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "da vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "a través de nodo ou vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "á via"
@@ -29557,5 +30037,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Ruta"
@@ -29564,5 +30044,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -29570,5 +30050,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Tipo de Ruta"
@@ -29676,5 +30156,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29685,17 +30165,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "camiño"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ski"
@@ -29763,5 +30243,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29771,9 +30251,9 @@
 msgstr "pé"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "desvío"
@@ -29787,10 +30267,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Descición de símbolo"
@@ -29798,31 +30278,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "conexión"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -29831,30 +30311,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "segmento da ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "segmento seguinte"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -31032,16 +31512,4 @@
 msgstr "aerovía"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33960,12 +34428,4 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "A via seleccionada non contén o nodo seleccionado."
-#~ msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grados Minutos Segundos"
-
 #~ msgid "Be sure to include the following information:"
 #~ msgstr "Asegúrate de incluir a seguinte información:"
@@ -33986,7 +34446,4 @@
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n"
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparando..."
 
 #~ msgid "Uploading..."
@@ -34365,4 +34822,9 @@
 #~ msgstr "Non hai documentos abertos, polo que non hai nada que gardar."
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "A via seleccionada non contén o nodo seleccionado."
+#~ msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
+
 #~ msgid "Update Data"
 #~ msgstr "Actualizar Datos"
@@ -34413,13 +34875,4 @@
 #~ msgstr "Erro de análise na URL: \"{0}\""
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Estás a punto de borrar nodos que se atopan fora da área que descargaches."
-#~ "<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
-#~ "estar usandoos.<br>Queres borralos realmente?"
-
 #~ msgid "Conflicting relation"
 #~ msgstr "Relación contradictoria"
@@ -34442,4 +34895,7 @@
 #~ msgid "true"
 #~ msgstr "verdadeiro"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grados Minutos Segundos"
 
 #~ msgid "Error: {0}"
@@ -34683,4 +35139,7 @@
 #~ msgstr "C"
 
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Non se atopou obxectivo para misturar o obxecto con id {0}"
+
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Erro na sintáxis do patrón: O patrón {0} de {1} non é válido!"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 22626)
+++ applications/editors/josm/i18n/po/he.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 12:21+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 20:31+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -226,4 +226,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -235,4 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -242,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -297,5 +299,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "ביטול"
@@ -361,4 +363,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -417,5 +420,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1358,5 +1361,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1421,4 +1424,52 @@
 msgid "Preferences"
 msgstr "העדפות"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Purge..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "מזג"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "התאם אתרי תוספים"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "הוספה לבחירה"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1460,4 +1511,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1694,4 +1746,5 @@
 msgstr "בחר לפחות דרך אחת לפישוט"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1699,4 +1752,5 @@
 #: ../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 "כן"
@@ -1745,8 +1799,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2898,4 +2951,5 @@
 
 #. 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
@@ -2925,5 +2979,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "אישור"
@@ -3133,8 +3187,11 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"אתה עומד למחוק נקודות מחוץ לשטח שהורדת.<br>זה עלול לגרום לבעיות כיוון שעצמים "
+"אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3165,10 +3222,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3178,4 +3230,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3554,5 +3612,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3562,6 +3620,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3571,10 +3629,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3582,5 +3642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3589,5 +3649,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3595,4 +3655,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3889,5 +3957,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -4161,69 +4229,69 @@
 msgstr "סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "שימוש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "אפשרויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "הצג עזרה זו"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "בחר עם החיפוש הנתון"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "אפס את המאפיינים לברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4233,9 +4301,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "דוגמאות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4243,45 +4311,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "מאתחל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "טען תוספים מוקדמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "קביעת ברירות מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "יוצר ממשקי גרפי ראשי"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "טעינת תוספים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4290,14 +4358,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "קובץ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4316,10 +4400,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "תצוגה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4327,5 +4411,5 @@
 msgstr "כלים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4333,5 +4417,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4342,5 +4426,5 @@
 msgstr "תפריט: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "שמע"
@@ -4438,17 +4522,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "שירות"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "בחר"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "מסחרי"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5164,5 +5245,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "הכל"
@@ -5798,5 +5879,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "יחסים"
@@ -5890,10 +5971,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6492,4 +6573,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6951,5 +7034,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6993,111 +7075,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "שם"
@@ -8129,21 +8212,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "רוחב מזערי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "אורך מזערי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "רוחב מירבי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "אורך מירבי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8152,10 +8239,10 @@
 "כתובת מ www.openstreetmap.org (אתה יכול להדביק כאן כתובת להורדת האיזור)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8164,15 +8251,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8317,8 +8404,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "סוג"
@@ -8347,6 +8434,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "לא ידוע"
@@ -8729,7 +8816,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "הכנס את התגובה שלך"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -8920,7 +9006,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9229,12 +9317,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "אפס"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "המשך"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9260,7 +9346,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "אל תציג שוב"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9443,5 +9528,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9622,5 +9707,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "תיאור"
@@ -11249,5 +11334,5 @@
 msgstr "צבעים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11258,35 +11343,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "הכרח קווים במידה ולא יובאו מקטעים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "צייר נקודות GPS גדולות."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11294,5 +11379,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11314,5 +11399,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11354,5 +11439,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11366,64 +11451,70 @@
 msgstr "רגל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "צייר חיצי כיוון"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "ציור מהיר (נראה מכוער יותר)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "רק בראשית הדרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "צייר מספרים סידוריים של קטע"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "צייר גבולות של נתונים שהורדו"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "צייר נקודות וירטואליות במצב הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "צייר שכבות לא פעילות בצבע שונה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "החלק גרפיקה של מפה (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "מחבר"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "סירה"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11431,9 +11522,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11441,34 +11532,34 @@
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ''1-'' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "אורך מירבי (מטרים)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "הכרח ציור קווים במידה והנתונים המיובאים אינם מכילים נתוני קווים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "צייר חצי כיוון לקווים המחברים נקודות GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11476,13 +11567,13 @@
 msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "מרחק מינימלי (פיקסלים)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "צייר נקודות גדולות יותר עבור נקודות ה-GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11490,9 +11581,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11500,55 +11591,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "תמונת נקודת דרך"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "נקודות GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "צייר רמזי כיוון עבור קטעי דרך."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "צייר את גבולות המידע שמורד מהשרת."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "צייר את שכבת הנתונים הלא פעילה בצבע אחר."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "נתוני OSM"
@@ -11915,7 +12005,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "שכבה לעריכת מדידות."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12756,5 +12845,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14315,5 +14404,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14340,5 +14429,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14582,5 +14671,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr ""
@@ -15029,5 +15118,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "מבנים"
@@ -15264,5 +15353,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17213,7 +17302,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "הגירסה הפתורה:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -17833,13 +17921,13 @@
 msgstr "מדרג"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "ערוך חנות נעליים"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "מפריד"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18916,5 +19004,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr ""
@@ -20869,5 +20957,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "התייחסות"
@@ -21406,5 +21494,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21417,5 +21505,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr ""
@@ -21693,4 +21781,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21719,9 +21869,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "כן"
@@ -21831,9 +22012,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "לא"
@@ -22257,5 +22469,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22290,5 +22502,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22302,5 +22514,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22429,4 +22649,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22458,14 +22686,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "מפעיל"
@@ -22727,12 +22959,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "הגבהה"
@@ -23584,5 +23816,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr ""
@@ -23894,6 +24126,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -23945,32 +24179,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
@@ -23979,4 +24213,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24029,174 +24264,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24226,7 +24461,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr ""
@@ -24242,5 +24477,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr ""
@@ -24253,6 +24488,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr ""
@@ -24428,5 +24663,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr ""
@@ -24463,6 +24698,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "מקלט"
@@ -24470,5 +24705,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "ספסל"
@@ -24587,5 +24822,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr ""
@@ -24645,11 +24880,241 @@
 msgstr ""
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "מסוף"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "מספר טלפון"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr ""
@@ -24657,20 +25122,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr ""
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr ""
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr ""
@@ -24678,10 +25143,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr ""
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr ""
@@ -24689,30 +25154,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr ""
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr ""
@@ -24720,10 +25185,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "מזון ושתיה"
@@ -24734,5 +25199,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "מסעדה"
@@ -24740,11 +25205,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr ""
@@ -24752,78 +25217,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "קבב"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "תורכי"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "אסייתי"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "תאילנדי"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "מקסיקני"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "יפני"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "מזון מהיר"
@@ -24831,17 +25297,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "ערוך מסעדת מזון מהיר"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "בית קפה"
@@ -24849,9 +25327,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "ערוך בית קפה"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "פאב"
@@ -24859,19 +25338,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "ערוך פאב"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "בר"
@@ -24879,9 +25359,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "ערוך בר"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "מועדון לילה"
@@ -24889,24 +25370,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "ערוך מועדון לילה"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "תיירות"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "מוזיאון"
@@ -24914,9 +25396,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "ערוך מוזיאון"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "גן חיות"
@@ -24925,9 +25407,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "ערוך גן חיות"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "נקודת תצפית"
@@ -24935,24 +25417,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "ערוך נקודת תצפית"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "מגדל תצפית"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "פארק שעשועים"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "ערוך פארק שעשועים"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "יצירת אומנות"
@@ -24960,5 +25442,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "ערוך יצירת אומנות"
@@ -24966,19 +25448,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "מפה"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25016,5 +25498,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25022,28 +25504,28 @@
 msgstr "רחוב"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25053,5 +25535,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25059,5 +25541,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "צעידה"
@@ -25065,6 +25547,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "רכיבה"
@@ -25072,5 +25554,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25078,6 +25560,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "סקי"
@@ -25085,5 +25567,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25091,46 +25573,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "היסטוריה"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "טבע"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25139,5 +25621,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25145,29 +25627,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "ערוך מקלט"
@@ -25175,25 +25657,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "אתר פיקניק"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "ערוך אתר פיקניק"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "מקומות היסטורים"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "טירה"
@@ -25202,19 +25684,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "ערוך טירה"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "חורבות"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "ערוך חורבות"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "אתר ארכיאולוגי"
@@ -25223,9 +25705,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "ערוך אתר ארכיאולוגי"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "שדה קרב"
@@ -25233,10 +25715,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "ערוך שדה קרב"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25244,5 +25726,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25250,15 +25732,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -25266,55 +25748,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -25322,35 +25804,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "דייג"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -25364,6 +25846,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -25779,6 +26261,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -25813,240 +26295,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "קשתות"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "אתלטיקה"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "כדור בסיס"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "כדורסל"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "כדורת דשא"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "קנו"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "טיפוס"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "קריקט"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "מירוץ כלבים"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "גולף"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "התעמלות"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "הוקי"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "מירוץ סוסים"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "סקייטבורד"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "סקייטים"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "סקי"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "כדורגל"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "שחייה"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "טניס שולחן"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "טניס"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26088,23 +26570,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "סוג"
@@ -26146,211 +26628,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "מרכז ספורט"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "איצטדיון"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "קשתות"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "ספורט מוטורי"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "ערוך ספורט מוטורי"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
@@ -26358,52 +26840,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "מקצוענים"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "ירי"
@@ -26411,204 +26893,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "גולף"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "טניס"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "מבנה"
@@ -26616,5 +27098,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -26622,10 +27104,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -26633,10 +27115,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "שגרירות"
@@ -26644,10 +27126,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -26656,10 +27138,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "כלא"
@@ -26668,10 +27150,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "משטרה"
@@ -26681,10 +27163,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -26693,10 +27175,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "דואר"
@@ -26704,5 +27186,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -26710,15 +27192,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "בית ספר"
@@ -26726,10 +27208,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "אוניברסיטה"
@@ -26737,10 +27219,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "מכללה"
@@ -26748,5 +27230,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -26754,5 +27236,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "קולנוע"
@@ -26761,10 +27243,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "ספרייה"
@@ -26773,9 +27255,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -26783,10 +27265,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -26795,10 +27277,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -26808,5 +27290,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -26815,6 +27297,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "דת"
@@ -26823,66 +27305,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr ""
@@ -26891,81 +27373,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "סוני"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "כתובות"
@@ -26974,5 +27456,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "ערוך כתובת"
@@ -26980,5 +27462,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "מספר בית"
@@ -26986,25 +27468,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "שם רחוב"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -27013,5 +27495,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -27019,61 +27501,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "סכמת מספור"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "אי-זוגי"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "מגדל"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27081,25 +27563,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -27107,10 +27589,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -27118,10 +27600,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "צינור"
@@ -27130,41 +27612,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "מיקום"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr ""
@@ -27174,10 +27656,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr ""
@@ -27185,5 +27667,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr ""
@@ -27191,10 +27673,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr ""
@@ -27202,10 +27684,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr ""
@@ -27213,23 +27695,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr ""
@@ -27239,35 +27721,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -27276,10 +27758,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr ""
@@ -27288,5 +27770,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27294,10 +27776,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -27308,23 +27790,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "קו מתח"
@@ -27333,20 +27815,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27354,55 +27836,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "שירותים"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "טלפון"
@@ -27411,5 +27893,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -27417,5 +27899,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr ""
@@ -27423,5 +27905,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr ""
@@ -27429,5 +27911,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27435,5 +27917,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr ""
@@ -27441,15 +27923,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr ""
@@ -27458,5 +27940,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -27464,35 +27946,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27500,5 +27982,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27507,31 +27989,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -27610,5 +28092,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27618,31 +28100,31 @@
 msgstr "ירוק"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27651,30 +28133,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "מזרקה"
@@ -27683,10 +28165,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -27695,10 +28177,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27707,5 +28189,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27713,5 +28195,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -27719,15 +28201,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27735,10 +28217,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "ערוך חנות רכב"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27747,28 +28229,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "ערוך חנות אופניים"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -27776,9 +28258,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -27786,27 +28268,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "קצבייה"
@@ -27814,9 +28296,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "ערוך קצבייה"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "מאפייה"
@@ -27824,9 +28306,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "ערוך מאפייה"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "פרחים"
@@ -27834,18 +28316,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "ערוך חנות אורגנית"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr ""
@@ -27853,54 +28335,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr ""
@@ -27908,9 +28390,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr ""
@@ -27918,9 +28400,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -27928,54 +28410,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "ערוך חנות עשה-זאת-בעצמך"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -27983,9 +28465,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "ערוך ניקוי יבש"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "מכבסה"
@@ -27993,9 +28475,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "ערוך מכבסה"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr ""
@@ -28003,24 +28485,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -28028,5 +28510,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -28034,97 +28516,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "בנק"
@@ -28132,14 +28614,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "ערוך בנק"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -28147,5 +28629,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -28153,15 +28635,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "רופאים"
@@ -28169,18 +28651,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -28188,5 +28670,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -28194,9 +28676,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "בית חולים"
@@ -28204,10 +28686,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -28216,5 +28698,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -28223,20 +28705,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "מספר טלפון"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -28244,5 +28721,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -28251,64 +28728,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "מקומות"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "יבשת"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "ארץ"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "מדינה"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "אזור"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "מחוז"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -28316,15 +28793,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "עיר"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "עיירה"
@@ -28332,10 +28809,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "פרבר"
@@ -28343,25 +28820,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "כפר"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -28369,5 +28846,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "מקומיות"
@@ -28375,10 +28852,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "אי"
@@ -28386,10 +28863,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "ערוך אי"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28397,5 +28874,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28403,5 +28880,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -28409,10 +28886,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "פסגה"
@@ -28420,10 +28897,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "קרחון"
@@ -28431,10 +28908,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "הר געש"
@@ -28442,70 +28919,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "לאומי"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "פוליטי"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "עץ"
@@ -28514,15 +28991,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "חורש"
@@ -28531,5 +29008,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -28537,17 +29014,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "יער"
@@ -28556,14 +29033,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28571,25 +29048,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -28597,10 +29074,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "שדה-בור"
@@ -28608,5 +29085,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
@@ -28614,5 +29091,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -28621,45 +29098,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28667,25 +29144,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "דשא"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -28693,10 +29170,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr ""
@@ -28704,20 +29181,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr ""
@@ -28725,5 +29202,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -28731,15 +29208,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -28747,9 +29224,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -28757,39 +29234,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr ""
@@ -28797,15 +29274,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "צבאי"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28813,50 +29290,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -28866,5 +29343,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28876,5 +29353,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr ""
@@ -28882,5 +29359,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr ""
@@ -28888,5 +29365,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -28897,5 +29374,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -28903,36 +29380,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -28940,5 +29417,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr ""
@@ -28947,5 +29424,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -28953,34 +29430,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr ""
@@ -28989,15 +29466,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr ""
@@ -29005,5 +29482,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr ""
@@ -29012,5 +29489,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr ""
@@ -29018,5 +29495,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr ""
@@ -29124,5 +29601,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29133,17 +29610,17 @@
 msgstr "אופניים"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29211,5 +29688,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29219,9 +29696,9 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29235,10 +29712,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29246,31 +29723,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr ""
@@ -29279,30 +29756,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30480,16 +30957,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "מסוף"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33408,12 +33873,4 @@
 msgstr ""
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
-#~ msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "מעלות דקות שניות"
-
 #~ msgid "Move"
 #~ msgstr "הזז"
@@ -33700,4 +34157,7 @@
 #~ msgid "Split way segment"
 #~ msgstr "פצל קטע דרך"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "מעלות דקות שניות"
 
 #~ msgid "different"
@@ -33854,12 +34314,4 @@
 #~ msgstr "EPSG:4326"
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "אתה עומד למחוק נקודות מחוץ לשטח שהורדת.<br>זה עלול לגרום לבעיות כיוון "
-#~ "שעצמים אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
-
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "פתור {0} התנגשויות ב{1} עצמים"
@@ -33873,4 +34325,9 @@
 #~ msgid "Expected closing parenthesis."
 #~ msgstr "ציפיתי לסוגר סוגריים."
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
+#~ msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
 
 #~ msgid "Remove Selected"
@@ -33902,7 +34359,4 @@
 #~ msgid "Update Data"
 #~ msgstr "עדכן נתונים"
-
-#~ msgid "Continue anyway"
-#~ msgstr "המשך בכל זאת"
 
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 22626)
+++ applications/editors/josm/i18n/po/is.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 12:00+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 22:35+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -222,4 +222,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -231,4 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -238,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -293,5 +295,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Hætta við"
@@ -358,4 +360,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -414,5 +417,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1358,5 +1361,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1421,4 +1424,52 @@
 msgid "Preferences"
 msgstr "Stillingar"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Purge..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamborgarar"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Stilla viðbótarþjóna"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "bæta við val"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1460,4 +1511,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1693,4 +1745,5 @@
 msgstr "Veldu í það minnsta einn veg til að einfalda."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1698,4 +1751,5 @@
 #: ../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 "Já"
@@ -2903,4 +2957,5 @@
 
 #. 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
@@ -2930,5 +2985,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "Í lagi"
@@ -3139,8 +3194,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað."
+"<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) gætu "
+"verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3171,10 +3230,5 @@
 msgstr[1] "Færði {0} hnúta"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3184,4 +3238,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3560,5 +3620,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3568,6 +3628,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3577,10 +3637,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3588,5 +3650,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3595,5 +3657,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3601,4 +3663,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3895,5 +3965,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr ""
@@ -4161,69 +4231,69 @@
 msgstr "Lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4233,9 +4303,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4243,45 +4313,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Upphafsstilli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Bý til aðal notandaviðmót"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Hleð inn viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4290,14 +4360,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Skrá"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4316,10 +4402,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Sýn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4327,5 +4413,5 @@
 msgstr "Tól"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4333,5 +4419,5 @@
 msgstr "Forstillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4342,5 +4428,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Hljóð"
@@ -4438,17 +4524,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Þjónustuvegur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "kínversk"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Skrifstofur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5156,5 +5239,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr ""
@@ -5790,5 +5873,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Vensl"
@@ -5882,10 +5965,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6486,4 +6569,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6945,5 +7030,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6987,111 +7071,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Heiti"
@@ -8128,21 +8213,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "Minnsta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "Minnsta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "Mesta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "Mesta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8152,10 +8241,10 @@
 "svæðinu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Afmarkað svæði"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8164,15 +8253,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8317,8 +8406,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Gerð"
@@ -8347,6 +8436,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "óskilgreint"
@@ -8921,7 +9010,9 @@
 msgstr "Velja skráarnafn"
 
+#. 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 ""
@@ -9230,12 +9321,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Endurstilla"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Halda áfram"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9261,7 +9350,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Ekki sýna þessi skilaboð aftur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9444,5 +9532,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9627,5 +9715,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Lýsing"
@@ -11240,5 +11328,5 @@
 msgstr "Litir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11249,35 +11337,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Fyrir staðværar skrár"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Aldrei"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Teikna stóra GPS punkta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hraði (rauður = hægari, grænn = hraðari)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11285,5 +11373,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11305,5 +11393,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11345,5 +11433,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11357,63 +11445,70 @@
 msgstr "Fótgangandi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Notandi"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11421,9 +11516,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Teikna línu á milli GPS punkta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11433,9 +11528,9 @@
 "milli þeirra. Stilltu þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Hámarkslengd lína fyrir staðværar skrár (í metrum)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11444,25 +11539,25 @@
 "þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Hámarkslengt milli punkta (í metrum)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11470,13 +11565,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11484,9 +11579,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11494,54 +11589,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM gögn"
@@ -11909,7 +12004,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Lag ætlað til mælinga"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12750,5 +12844,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14308,5 +14402,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14333,5 +14427,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14575,5 +14669,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr ""
@@ -15022,5 +15116,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Byggingar"
@@ -15257,5 +15351,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17819,10 +17913,11 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Breyti skóbúð"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
 msgstr ""
@@ -18899,5 +18994,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Marghyrningur"
@@ -20848,5 +20943,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Tilvísun"
@@ -21385,5 +21480,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21396,5 +21491,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "skógur"
@@ -21672,4 +21767,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21698,9 +21855,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "já"
@@ -21810,9 +21998,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "nei"
@@ -22236,5 +22455,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22269,5 +22488,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22281,5 +22500,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22408,4 +22635,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22437,14 +22672,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Rekstraraðili"
@@ -22706,12 +22945,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -23563,5 +23802,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Volt"
@@ -23873,6 +24112,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -23924,32 +24165,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Opnunartími"
@@ -23958,4 +24199,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24008,174 +24250,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24205,7 +24447,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Tilvísun"
@@ -24221,5 +24463,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr ""
@@ -24232,6 +24474,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr ""
@@ -24407,5 +24649,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr ""
@@ -24442,6 +24684,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Skýli"
@@ -24449,5 +24691,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Bekkur"
@@ -24566,5 +24808,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr ""
@@ -24624,11 +24866,241 @@
 msgstr "Breyti hóteli"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Stjörnur"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr ""
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Vegahótel"
@@ -24636,20 +25108,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Breyti vegahóteli"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -24657,10 +25129,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -24668,30 +25140,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Breyti farfuglaheimili"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -24699,10 +25171,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Breyti tjaldstæði"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -24713,5 +25185,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Veitingastaður"
@@ -24719,11 +25191,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Breyti veitingastað"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Matargerð"
@@ -24731,78 +25203,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "ítölsk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "kínversk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamborgarar"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "grísk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indversk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "að hætti heimamanna"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "tyrknesk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -24810,17 +25283,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -24828,9 +25313,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Bar"
@@ -24838,19 +25324,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Bjórgarður (þ. Biergarten)"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Breyti bjórgarði (þýska: Biergarten)"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr ""
@@ -24858,9 +25345,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -24868,24 +25356,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Safn"
@@ -24893,9 +25382,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Breyti safni"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -24904,9 +25393,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Breyti dýragarð"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -24914,24 +25403,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Skemmtigarður"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Listaverk"
@@ -24939,5 +25428,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Breyti listaverki"
@@ -24945,19 +25434,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -24995,5 +25484,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25001,28 +25490,28 @@
 msgstr "stræti"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Nánari lýsing"
@@ -25032,5 +25521,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25038,5 +25527,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr ""
@@ -25044,6 +25533,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr ""
@@ -25051,5 +25540,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25057,6 +25546,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Skíði"
@@ -25064,5 +25553,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25070,46 +25559,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "sagnfræði"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "dýralíf"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25118,5 +25607,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25124,29 +25613,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
@@ -25154,25 +25643,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Eldstæði"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Kastali"
@@ -25181,19 +25670,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -25202,9 +25691,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -25212,10 +25701,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Breyti vígvelli"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25223,5 +25712,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25229,15 +25718,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -25245,55 +25734,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -25301,35 +25790,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Íþróttir"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -25343,6 +25832,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -25758,6 +26247,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -25792,240 +26281,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "skotfimi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26067,23 +26556,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "gerð"
@@ -26125,211 +26614,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "völlur"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "íþróttamiðstöð"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "íþróttaleikvangur"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Skautar"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Sund"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -26337,52 +26826,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -26390,204 +26879,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Mannvirki"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Bygging"
@@ -26595,5 +27084,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -26601,10 +27090,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -26612,10 +27101,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -26623,10 +27112,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -26635,10 +27124,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Fangelsi"
@@ -26647,10 +27136,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -26660,10 +27149,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -26672,10 +27161,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Pósthús"
@@ -26683,5 +27172,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -26689,15 +27178,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Skóli"
@@ -26705,10 +27194,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Háskóli"
@@ -26716,10 +27205,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Menntaskóli"
@@ -26727,5 +27216,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -26733,5 +27222,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -26740,10 +27229,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Bókasafn"
@@ -26752,9 +27241,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -26762,10 +27251,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Leikhús"
@@ -26774,10 +27263,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -26787,5 +27276,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -26794,6 +27283,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr ""
@@ -26802,66 +27291,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr ""
@@ -26870,81 +27359,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -26953,5 +27442,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -26959,5 +27448,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Húsnúmer"
@@ -26965,25 +27454,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Nafn götu"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Landskóði"
@@ -26992,5 +27481,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -26998,61 +27487,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Turn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27060,25 +27549,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Viti"
@@ -27086,10 +27575,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -27097,10 +27586,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -27109,41 +27598,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr ""
@@ -27153,10 +27642,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Krani"
@@ -27164,5 +27653,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Breyti krana"
@@ -27170,10 +27659,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr ""
@@ -27181,10 +27670,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -27192,23 +27681,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Rafall"
@@ -27218,35 +27707,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Orkuver"
@@ -27255,10 +27744,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -27267,5 +27756,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -27273,10 +27762,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -27287,23 +27776,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Raflína"
@@ -27312,20 +27801,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27333,55 +27822,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Salerni"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -27390,5 +27879,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -27396,5 +27885,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Mynt"
@@ -27402,5 +27891,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Athugasemd"
@@ -27408,5 +27897,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27414,5 +27903,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -27420,15 +27909,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -27437,5 +27926,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -27443,35 +27932,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27479,5 +27968,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27486,31 +27975,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -27589,5 +28078,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27597,31 +28086,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27630,30 +28119,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -27662,10 +28151,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -27674,10 +28163,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27686,5 +28175,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27692,5 +28181,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -27698,15 +28187,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27714,10 +28203,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Breyti bílabúð"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27726,28 +28215,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Breyti hjólabúð"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr ""
@@ -27755,9 +28244,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -27765,27 +28254,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Ferðaskrifstofa"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Breyti ferðaskrifstofu"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Slátrari"
@@ -27793,9 +28282,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Breyti slátrara"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Bakarí"
@@ -27803,9 +28292,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Breyti bakaríi"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Blómabúð"
@@ -27813,18 +28302,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Breyti blómabúð"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr ""
@@ -27832,54 +28321,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Vínbúð"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Tölvubúð"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr ""
@@ -27887,9 +28376,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr ""
@@ -27897,9 +28386,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27907,54 +28396,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -27962,9 +28451,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Breyti efnalaug"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -27972,9 +28461,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Breyti þvottahúsi"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -27982,24 +28471,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Breyti útivistarbúð"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -28007,5 +28496,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr ""
@@ -28013,97 +28502,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banki"
@@ -28111,14 +28600,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Breyti banka"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -28126,5 +28615,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -28132,15 +28621,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Læknir"
@@ -28148,18 +28637,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -28167,5 +28656,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -28173,9 +28662,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Spítali"
@@ -28183,10 +28672,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr ""
@@ -28195,5 +28684,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28202,20 +28691,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr ""
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28223,5 +28707,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -28230,64 +28714,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Landafræði"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Staðir"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Fylki"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Svæði"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Sýsla"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -28295,15 +28779,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Borg"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Bær"
@@ -28311,10 +28795,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Hverfi"
@@ -28322,25 +28806,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Þorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -28348,5 +28832,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr ""
@@ -28354,10 +28838,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Eyja"
@@ -28365,10 +28849,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Breyti eyju"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28376,5 +28860,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28382,5 +28866,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -28388,10 +28872,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Tindur"
@@ -28399,10 +28883,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Jökull"
@@ -28410,10 +28894,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -28421,70 +28905,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Landamæri"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Tré"
@@ -28493,15 +28977,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Skógur"
@@ -28510,5 +28994,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -28516,17 +29000,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "barrskógur"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -28535,14 +29019,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28550,25 +29034,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -28576,10 +29060,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr ""
@@ -28587,5 +29071,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr ""
@@ -28593,5 +29077,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr ""
@@ -28600,45 +29084,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28646,25 +29130,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Garður"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -28672,10 +29156,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr ""
@@ -28683,20 +29167,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr ""
@@ -28704,5 +29188,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -28710,15 +29194,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -28726,9 +29210,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr ""
@@ -28736,39 +29220,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Smásala"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr ""
@@ -28776,15 +29260,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28792,50 +29276,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -28845,5 +29329,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Breyta marghyrningi"
@@ -28855,5 +29339,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr ""
@@ -28861,5 +29345,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr ""
@@ -28867,5 +29351,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -28876,5 +29360,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -28882,36 +29366,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -28919,5 +29403,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Beygjutakmörkun"
@@ -28926,5 +29410,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Breyti beygjutakmörkun"
@@ -28932,34 +29416,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "vinstri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "hægri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "óleyfilegt að halda beint áfrám"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "óleyfilegt að taka U-beygju"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -28968,15 +29452,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "gegnum hnút eða veg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "að vegi"
@@ -28984,5 +29468,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr ""
@@ -28991,5 +29475,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr ""
@@ -28997,5 +29481,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr ""
@@ -29103,5 +29587,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29112,17 +29596,17 @@
 msgstr "hjól"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29190,5 +29674,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29198,9 +29682,9 @@
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29214,10 +29698,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29225,31 +29709,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr ""
@@ -29258,30 +29742,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30459,16 +30943,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr ""
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33387,9 +33859,4 @@
 msgstr ""
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
-#~ msgstr[1] "Vegirnir sem þú valdir innihalda ekki hnútana sem þú valdir."
-
 #~ msgid "Incorrect password or username."
 #~ msgstr "Rangt lykilorð eða notandanafn"
@@ -33563,13 +34030,4 @@
 #~ msgid "Ill-formed node id"
 #~ msgstr "Illa-formað kenni á hnút"
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Þú ert að fara eyða hnútum utan þess svæðis sem þú hefur niðurhalað."
-#~ "<br>Þetta getur valdið vandamálum því aðrir hlutir (sem þú sérð ekki) "
-#~ "gætu verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
 #~ msgid ""
@@ -33784,2 +34242,7 @@
 #~ msgid "Only two nodes allowed"
 #~ msgstr "Aðeins er hægt að velja tvo hnúta"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
+#~ msgstr[1] "Vegirnir sem þú valdir innihalda ekki hnútana sem þú valdir."
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 22626)
+++ applications/editors/josm/i18n/po/it.po	(revision 22628)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-02 08:52+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-09 08:25+0000\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -22,6 +22,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -118,6 +118,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -228,4 +228,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -237,4 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -299,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Annulla"
@@ -364,4 +366,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -420,5 +423,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1406,5 +1409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1472,4 +1475,53 @@
 msgid "Preferences"
 msgstr "Preferenze"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Surveyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Conferma"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "Aggiungi alla selezione"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1511,4 +1563,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1748,4 +1801,5 @@
 msgstr "Selezionare almeno un percorso da semplificare."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1753,4 +1807,5 @@
 #: ../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 "Si"
@@ -1796,11 +1851,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:80
 msgid "Split a way at the selected node."
-msgstr "Divide un percorso al nodo selezionato."
+msgstr "Divide un percorso in corrispondenza del nodo selezionato."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "La selezione attuale non può essere usata per la divisione."
+msgstr ""
+"La selezione corrente non può essere utilizzata per la divisione - nessun "
+"nodo è stato selezionato."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -1838,6 +1894,6 @@
 "middle of the way.)"
 msgstr ""
-"Il percorso non può essere diviso al nodo selezionato. (Suggerimento: "
-"seleziona i nodi in mezzo al percorso)."
+"Il percorso non può essere diviso in corrispondenza del nodo selezionato. "
+"(Suggerimento: seleziona i nodi in mezzo al percorso)."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:449
@@ -3067,4 +3123,5 @@
 
 #. 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
@@ -3094,5 +3151,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3311,7 +3368,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Si è in procinto di eliminare gli oggetti incompleti.<br>Questo causerà dei "
@@ -3346,10 +3404,5 @@
 msgstr[1] "Sposta {0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Epurato oggetto ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3359,4 +3412,10 @@
 msgstr[1] "Epurati {0} oggetti"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Epurato oggetto ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3732,5 +3791,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "deg° min'' sec\""
-msgstr ""
+msgstr "grad° min'' sec\""
 
 #. *
@@ -3739,5 +3798,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "deg° min'' (Nautical)"
-msgstr ""
+msgstr "grad° min'' (Nautico)"
 
 #. *
@@ -3776,5 +3835,5 @@
 "incluso"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3788,6 +3847,6 @@
 "continuare a lavorare senza problemi."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3797,10 +3856,12 @@
 msgstr "Manca la destinazione dell''unione per il percorso con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Manca la destinazione dell''unione per l''oggetto con id {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3808,5 +3869,5 @@
 msgstr "Manca la destinazione dell''unione per il nodo con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3815,5 +3876,5 @@
 msgstr "Manca la destinazione dell''unione per la relazione con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3822,4 +3883,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Manca la destinazione dell''unione di tipo {0} con id {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4128,5 +4197,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "ferrovia"
@@ -4403,39 +4472,39 @@
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "opzioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Mostra questo aiuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Scarica la zona delimitata dal riquadro di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Scarica la zona indicata dall''URL (interpretando lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Apre un file (qualunque tipo di file che possa essere aperto con File/Apri)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr ""
 "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4443,33 +4512,33 @@
 "gps grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Seleziona i risultati della ricerca della stringa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Lancia in modalità massimizzata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Reimposta le preferenze predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Imposta la lingua"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "opzioni fornite come proprietà di sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Cambia la cartella per tutte le impostazioni utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4483,9 +4552,9 @@
 "allocata (in megabyte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "Esempi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4495,46 +4564,46 @@
 "questo ordine."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "Assicurarsi di caricare qualche dato se si utilizza il parametro --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Inizializzazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Aggiornando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Installando plugins aggiornati"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Caricamento vecchie estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Impostazioni predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Creazione dell''interfaccia principale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Caricamento estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr "Dati OSM non salvati"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "Ripristina"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4545,5 +4614,5 @@
 "stato chiuso inaspettatamente. Si desidera ripristinare i dati?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4552,9 +4621,29 @@
 "più usata."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+"<h2>JOSM richiede la versione 6 di Java.</h2>Versione Java individuata: {0}."
+"<br>E'' possibile <ul><li>aggiornare la propria versione di Java (JRE) "
+"oppure</li><li>utilizzare una versione precedente (compatibile con Java 5) "
+"di JOSM.</li></ul>Maggiori informazioni:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr "Esci da JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr "Continua, prova comunque"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "File"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4573,10 +4662,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Visualizza"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4584,5 +4673,5 @@
 msgstr "Strumenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4590,5 +4679,5 @@
 msgstr "Preimpostati"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4599,5 +4688,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4698,17 +4787,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Numerico"
+msgstr "Metrico"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "cinese"
+msgstr "Cinese"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Commerciale (uffici)"
+msgstr "Anglosassone"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5480,5 +5566,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "tutti"
@@ -6165,5 +6251,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relazioni"
@@ -6259,10 +6345,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Seleziona nella lista delle relazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Selezionare la relazione nella lista delle relazioni"
@@ -6883,4 +6969,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7342,5 +7430,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7384,111 +7471,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nome"
@@ -8478,4 +8566,6 @@
 "current layer"
 msgstr ""
+"I membri provenienti dagli appunti non possono essere aggiunti perché non "
+"sono presenti nel livello corrente"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8640,21 +8730,25 @@
 msgstr "Rinomina i segnalibri correntemente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "Lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "Lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "Lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "Lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8664,10 +8758,10 @@
 "indirizzo URL qui per scaricare l''area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Riquadro di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8676,15 +8770,15 @@
 msgstr "La stringa ''{0}'' non è un valore in doppia precisione valido."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Per la latitudine è richiesto un valore nell''intervallo [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Per la longitudine è richiesto un valore nell''intervallo [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8841,8 +8935,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Tipo"
@@ -8871,6 +8965,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "sconosciuto"
@@ -9317,7 +9411,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Commento non valido"
+msgstr "Inserire un commento al caricamento"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9531,7 +9624,9 @@
 msgstr "Seleziona il nome del file"
 
+#. 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"
@@ -9869,17 +9964,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Commento non valido"
+msgstr "Si prega di rivedere il commento al caricamento"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Inverti"
+msgstr "Revisione"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Continua"
+msgstr "Utilizza così com'è"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9891,22 +9983,28 @@
 "explain your change, you will make life<br />easier for many other mappers."
 msgstr ""
+"Il proprio commento al caricamento è <i>vuoto</i>, oppure <i>molto breve</i>."
+"<br /><br />Questo è tecnicamente permesso, ma si prega di prendere in "
+"considerazione che gli utenti che monitorano<br />le modifiche effettuate "
+"nella propria zona si basano anche sui commenti<br />per capire ciò che è "
+"stato fatto!<br /><br />Se si utilizza un minuto in più ora per descrivere "
+"le proprie modifiche, si renderà la vita<br />più facile agli altri "
+"mappatori."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
 msgid "Return to the previous dialog to enter a more descriptive comment"
 msgstr ""
+"Ritorna alla finestra precedente per inserire un commento più significativo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Annulla e ritorna all''editor"
+msgstr "Annulla e ritorna alla finestra precedente"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
 msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Ignora questo suggerimento e carica ugualmente"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Non mostrare nuovamente"
+msgstr "Non mostrare più questo messaggio"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -10127,5 +10225,5 @@
 msgstr[1] "Caricamento di {0} oggetti..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10330,5 +10428,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Descrizione"
@@ -12138,5 +12236,5 @@
 msgstr "Colori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12147,36 +12245,36 @@
 msgstr "Tutti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "File locali"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Nessuno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forza le linee se nessun segmento è stato importato."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Disegna dei punti GPS grandi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Disegna un cerchio in base al valore HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocità (rosso = lento, verde = veloce)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Diluizione della precisione (rosso = alta, verde = bassa, se disponibile)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
@@ -12184,5 +12282,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12204,5 +12302,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12244,5 +12342,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12256,16 +12354,16 @@
 msgstr "Pedone"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Disegna le frecce di direzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Disegno veloce (appare più brutto)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12274,49 +12372,54 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Solo sull''estremità di un percorso."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Disegna i numeri d''ordine dei segmenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Disegna i confini dei dati scaricati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Disegna dei nodi virtuali nella modalità selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Disegna con altri colori i layer non attivi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Grafica della mappa migliorata (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Crea marcatori durante la lettura del tracciato GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autore"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr "Automatico"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Barca"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr "Entrambi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12326,9 +12429,9 @@
 "per ogni punto del percorso."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Disegna le linee tra i punti GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12338,9 +12441,9 @@
 "Usare ''-1'' per disegnare qualsiasi linea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Lunghezza massima per i file locali (metri)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12349,10 +12452,10 @@
 "permettere qualsiasi lunghezza."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12361,5 +12464,5 @@
 "sulle linee."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -12367,5 +12470,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12374,5 +12477,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12380,13 +12483,13 @@
 msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Distanza minima (in pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Disegna dei cerchi più grandi per i punti GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12396,9 +12499,9 @@
 "personalizzato nel Gestore dei Livelli."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Colora i punti e i segmenti del tracciato in base alla velocità."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12409,5 +12512,5 @@
 "registrare queste informazioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12415,27 +12518,26 @@
 "velocità medie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Colorazione del tracciato e del punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+msgstr "Permette la modifica all''etichettatura dei punti del percorso."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Descrizione del punto del percorso"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr "Etichettatura dei punti del percorso"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Punti GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Disegna il verso sui segmenti dei percorsi."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
@@ -12444,5 +12546,5 @@
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12450,10 +12552,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Disegna i confini dei dati scaricati dal server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12462,9 +12564,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Disegna con un colore diverso i layer non attivi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Dati OSM"
@@ -12870,7 +12972,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Livello in cui fare le misurazioni"
+msgstr "Sistema di misurazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13824,5 +13925,5 @@
 msgstr "Analisi della risposta proveniente dal server..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -15621,5 +15722,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15654,5 +15755,5 @@
 "serio problema di configurazione. JOSM terminerà di funzionare."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15924,5 +16025,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -16471,5 +16572,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Edifici"
@@ -16661,5 +16762,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Use \"Tableau d''assemblage\""
-msgstr ""
+msgstr "Utilizza \"Tableau d''assemblage\""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16725,5 +16826,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -16980,4 +17081,6 @@
 "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."
 msgstr ""
+"Aggiungi \"Tableau(x) d'assemblage\" nella lista delle schede catastali da "
+"trascinare."
 
 #. the crosspiece display
@@ -16998,5 +17101,5 @@
 msgstr ""
 "Seleziona automaticamente il primo livello WMS se esistono più livelli "
-"durante l''operazione di cattura."
+"durante l''operazione di trascinamento."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348
@@ -17065,6 +17168,6 @@
 "Use the normal Cadastre Grab menu."
 msgstr ""
-"Comune vettorializzato !\n"
-"Utilizzare normalmente il menu di cattura del catasto."
+"Comune vettorializzato!\n"
+"Utilizza il normale menu di trascinamento del catasto."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
@@ -18767,7 +18870,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "versione risolta:"
+msgstr "leggi la versione del protocollo"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18841,4 +18943,6 @@
 "web sites to detect a running JOSM."
 msgstr ""
+"E'' stato richiesto a Remote Control di riferire la sua versione del "
+"protocollo. Questo permette ai siti web di individuare un JOSM in esecuzione."
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
@@ -19405,13 +19509,13 @@
 msgstr "Complesso"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Simbolo SeaMap"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Separatore"
+msgstr "Editor delle caratteristiche nautiche"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20598,5 +20702,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -21401,5 +21505,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:235
 msgid "deinterlacing using line doubling"
-msgstr ""
+msgstr "Deinterlacciamento con raddoppio linea"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243
@@ -22453,4 +22557,7 @@
 "constrained by maximum removed area size. Also average nearby nodes."
 msgstr ""
+"Semplifica l''area eliminando i nodi su angoli molto ottusi. Questo può "
+"essere limitato dalla dimensione massima dell''area rimossa. Calcola anche "
+"la media dei nodi vicini."
 
 #. Plugin slippymap
@@ -22493,5 +22600,5 @@
 #: build/trans_plugins.java:88
 msgid "Create and edit seamarks for OpenSeaMap"
-msgstr ""
+msgstr "Crea e modifica le caratteristiche nautiche per OpenSeaMap"
 
 #. Plugin touchscreenhelper
@@ -22713,5 +22820,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Riferimento"
@@ -23250,5 +23357,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "metallo"
@@ -23261,5 +23368,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "bosco"
@@ -23537,4 +23644,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -23563,9 +23732,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "si"
@@ -23675,9 +23875,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "no"
@@ -24101,5 +24332,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "escursionismo"
@@ -24134,5 +24365,5 @@
 msgstr "buona"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "intermedio"
@@ -24146,5 +24377,13 @@
 msgstr "orribile"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Sedie a rotelle"
@@ -24273,4 +24512,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -24302,14 +24549,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operatore"
@@ -24571,12 +24822,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Elevazione"
@@ -25428,5 +25679,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Tensione"
@@ -25738,6 +25989,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -25789,32 +26042,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Orario di apertura"
@@ -25823,4 +26076,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -25873,174 +26127,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Ve 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr "Con chiosco"
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Tipi di carburante:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 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:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel per veicoli di trasporto merci pesanti"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "91 ottani"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "95 ottani"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "98 ottani"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "100 ottani"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (miscela 10% etanolo)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (miscela 85% etanolo)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (gas di petrolio liquefatto)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GNC (gas naturale compresso)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr "Miscela 1/25 (mofa/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "Miscela 1/50 (mofa/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr "Con chiosco"
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -26070,7 +26325,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Numero di riferimento"
@@ -26086,5 +26341,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "sotterraneo"
@@ -26097,6 +26352,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Tariffa"
@@ -26272,5 +26527,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -26307,6 +26562,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
@@ -26314,5 +26569,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Panchina"
@@ -26431,5 +26686,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Torre radio"
@@ -26489,11 +26744,241 @@
 msgstr "Modifica hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Stelle"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal aeroportuale"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Numero di telefono"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -26501,20 +26986,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -26522,10 +27007,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Ostello"
@@ -26533,30 +27018,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -26564,10 +27049,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -26578,5 +27063,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
@@ -26584,11 +27069,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Cucina"
@@ -26596,78 +27081,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "provinciale"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "francese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "tramezzino"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
-msgstr ""
-
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+msgstr "Microbirreria"
+
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Fast food"
@@ -26675,17 +27161,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "fish-and-chips"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "pollo"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -26693,9 +27191,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -26703,19 +27202,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -26723,9 +27223,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -26733,24 +27234,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museo"
@@ -26758,9 +27260,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -26769,9 +27271,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -26779,24 +27281,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Opera d''arte"
@@ -26804,5 +27306,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Modifica opera d''arte"
@@ -26810,19 +27312,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Grado di dettaglio"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topografico"
@@ -26860,5 +27362,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26866,28 +27368,28 @@
 msgstr "strada"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "schema"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Area visualizzata"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "luogo"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "città"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "provincia"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
@@ -26897,5 +27399,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Itinerari segnalati per:"
@@ -26903,5 +27405,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Percorso escursionistico"
@@ -26909,6 +27411,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -26916,5 +27418,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -26922,6 +27424,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Sci"
@@ -26929,5 +27431,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Equitazione"
@@ -26935,54 +27437,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... altre modalità di trasporto possibili"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Contenuto del cartello"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "avviso"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "fauna"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "piantine"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Indicatore stradale"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "palo"
+msgstr "Pennone"
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
@@ -26990,29 +27491,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Descrizione dettagliata"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audio-guida"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Audio-guida tramite cellulare?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Numero di telefono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -27020,25 +27521,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Castello"
@@ -27047,19 +27548,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -27068,9 +27569,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -27078,10 +27579,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Sito paleontologico"
@@ -27089,5 +27590,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Modifica sito paleontologico"
@@ -27095,15 +27596,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Memoriale"
@@ -27111,55 +27612,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Parco giochi"
@@ -27167,35 +27668,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -27209,6 +27710,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -27624,6 +28125,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27658,240 +28159,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "tiro con l''arco"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "football americano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "calcio canadese"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "sport equestri"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr "calcio gaelico"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr "rugby a 13"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr "rugby a 15"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Discipline sportive"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -27933,23 +28434,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "tipo"
@@ -27991,211 +28492,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "campo sportivo"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "centro sportivo"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "tracciato"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Tiro con l''arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Modifica tiro con l''arco"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -28203,52 +28704,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -28256,204 +28757,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Discipline sportive (palla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr "Football americano"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr "Modifica football americano"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr "Calcio canadese"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr "Modifica calcio canadese"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr "Calcio gaelico"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr "Modifica calcio gaelico"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr "Rugby a 13 (rugby league)"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr "Modifica rugby a 13 (rugby league)"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr "Rugby a 15 (rugby union)"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr "Modifica rugby a 15 (rugby union)"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Artificiale"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Palazzo"
@@ -28461,5 +28962,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -28467,10 +28968,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Municipio"
@@ -28478,10 +28979,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Modifica municipio"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -28489,10 +28990,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -28501,10 +29002,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Prigione"
@@ -28513,10 +29014,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Polizia"
@@ -28526,10 +29027,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -28538,10 +29039,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -28549,5 +29050,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -28555,15 +29056,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Modifica asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Scuola"
@@ -28571,10 +29072,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Modifica scuola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Università"
@@ -28582,10 +29083,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Scuola superiore"
@@ -28593,5 +29094,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Modifica scuola superiore"
@@ -28599,5 +29100,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Cinema"
@@ -28606,10 +29107,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Biblioteca"
@@ -28618,9 +29119,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -28628,10 +29129,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d''arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teatro"
@@ -28640,10 +29141,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -28653,5 +29154,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -28660,6 +29161,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religione"
@@ -28668,66 +29169,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "Bahaista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "Induista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "Giainista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "Taoista"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "Unitariana"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "Zoroastrista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Denominazione"
@@ -28736,81 +29237,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "Sciita"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "Sunnita"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -28819,5 +29320,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -28825,5 +29326,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Numero civico"
@@ -28831,25 +29332,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Nome Strada"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Codice nazione"
@@ -28858,5 +29359,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -28864,61 +29365,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Artificiale"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Tipo di torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "telecomunicazioni"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "osservazione"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Altezza (metri)"
@@ -28926,25 +29427,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Faro"
@@ -28952,10 +29453,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -28963,10 +29464,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -28975,41 +29476,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "calore"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "petrolio"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "liquami"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "qualunque sostanza"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Posizione"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "subacqueo"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "sopra il suolo"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -29019,10 +29520,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Gru permanente"
@@ -29030,5 +29531,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
@@ -29036,10 +29537,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -29047,10 +29548,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -29058,23 +29559,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "interno"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "esterno"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "pubblico"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -29084,35 +29585,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -29121,10 +29622,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -29133,5 +29634,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -29139,10 +29640,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Riferimento elettrodotto"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -29153,23 +29654,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "traliccio"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "palo"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Riferimento torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Elettrodotto"
@@ -29178,20 +29679,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Modifica elettrodotto"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Tipo di linea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr "elettrodotto"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -29199,55 +29700,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Numero di fili (conduttori) per cavo elettrico"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "singolo"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "doppio"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "triplo"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "quadruplo"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Bagni pubblici"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limitato"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefono"
@@ -29256,5 +29757,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -29262,5 +29763,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Monete"
@@ -29268,5 +29769,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Note"
@@ -29274,5 +29775,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -29280,5 +29781,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -29286,15 +29787,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -29303,5 +29804,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -29309,35 +29810,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Cestino della spazzatura"
@@ -29345,5 +29846,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Modifica cestino della spazzatura"
@@ -29352,31 +29853,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Schienale"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "pietra"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plastica"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Colore"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "nero"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "marrone"
@@ -29455,5 +29956,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -29463,31 +29964,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "rosso"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "blu"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "grigio"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "bianco"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -29496,30 +29997,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fontana"
@@ -29528,10 +30029,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -29540,10 +30041,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Pompa antincendio"
@@ -29552,5 +30053,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Modifica pompa antincendio"
@@ -29558,5 +30059,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -29564,15 +30065,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Concessionaria"
@@ -29580,10 +30081,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Modifica concessionaria"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Negozio di biciclette"
@@ -29592,28 +30093,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Modifica negozio di biciclette"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Articoli di pulizia e bellezza"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Modifica negozio di articoli di pulizia e bellezza"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -29621,9 +30122,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -29631,27 +30132,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Modifica chiosco"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Libreria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Modifica libreria"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Agenzia di viaggi"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Modifica agenzia di viaggi"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Macellaio"
@@ -29659,9 +30160,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Panificio"
@@ -29669,9 +30170,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Fiorista"
@@ -29679,18 +30180,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -29698,54 +30199,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Modifica negozio di alcolici (non in Italia)"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -29753,9 +30254,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -29763,9 +30264,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -29773,54 +30274,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Videoteca"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -29828,9 +30329,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -29838,9 +30339,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Sport all''aperto"
@@ -29848,24 +30349,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Modifica sport all''aperto"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Ottico"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -29873,5 +30374,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -29879,97 +30380,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr "camera d''aria per biciclette"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banca"
@@ -29977,14 +30478,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Modifica banca"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -29992,5 +30493,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -29998,15 +30499,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -30014,18 +30515,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -30033,5 +30534,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -30039,9 +30540,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Ospedale"
@@ -30049,10 +30550,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -30061,5 +30562,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Modifica colonnina SOS"
@@ -30068,20 +30569,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Nome del punto"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Numero di telefono"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -30089,5 +30585,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -30096,64 +30592,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Luoghi"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Nazione"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Regione"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Provincia"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -30161,15 +30657,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Città"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Paese"
@@ -30177,10 +30673,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Modifica paese"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Quartiere"
@@ -30188,25 +30684,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Modifica quartiere"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Frazione"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Modifica frazione"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Modifica borgo"
@@ -30214,5 +30710,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Località (luogo con nome, non popolato)"
@@ -30220,10 +30716,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Modifica località (luogo con nome, non popolato)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Isola"
@@ -30231,10 +30727,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Modifica isola"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Isoletta"
@@ -30242,5 +30738,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Modifica isoletta"
@@ -30248,5 +30744,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -30254,10 +30750,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -30265,10 +30761,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -30276,10 +30772,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Vulcano"
@@ -30287,70 +30783,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Nazionale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Politico"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Albero"
@@ -30359,15 +30855,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Bosco"
@@ -30376,5 +30872,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -30382,17 +30878,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Foresta"
@@ -30401,14 +30897,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -30416,25 +30912,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Modifica ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Prato alpino"
@@ -30442,10 +30938,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Modifica prato alpino"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Brughiera"
@@ -30453,5 +30949,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
@@ -30459,5 +30955,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Aia"
@@ -30466,45 +30962,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Prato"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -30513,25 +31009,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Giardino"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Erba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Village Green"
@@ -30539,10 +31035,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Area comune (UK)"
@@ -30550,20 +31046,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Modifica area comune (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Parco"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -30571,5 +31067,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -30577,15 +31073,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Area residenziale"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Modifica area residenziale"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -30593,9 +31089,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -30603,39 +31099,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -30643,15 +31139,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militare"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -30659,50 +31155,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Ridestinazione d''uso"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d''uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Cava"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
@@ -30712,5 +31208,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -30722,5 +31218,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "segmento esterno"
@@ -30728,5 +31224,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "segmento interno"
@@ -30734,5 +31230,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Confine"
@@ -30743,5 +31239,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Modifica confine"
@@ -30749,36 +31245,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Tipo di confine"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "amministrativo"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "nazionale"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "civile"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "circoscrizione elettorale"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Livello amministrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "Sotto-area"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Centro amministrativo"
@@ -30786,5 +31282,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -30793,5 +31289,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -30799,34 +31295,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -30835,15 +31331,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "verso il percorso"
@@ -30851,5 +31347,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Itinerario"
@@ -30858,5 +31354,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Modifica un itinerario"
@@ -30864,5 +31360,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Tipo di itinerario"
@@ -30970,5 +31466,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30979,17 +31475,17 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "sci"
@@ -31057,5 +31553,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -31065,9 +31561,9 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "deviazione"
@@ -31081,10 +31577,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -31092,31 +31588,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Stato dell''itinerario"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -31125,30 +31621,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "segmento di itinerario"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -32326,16 +32822,4 @@
 msgstr "aeroporto"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal aeroportuale"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -35254,49 +35738,39 @@
 msgstr "Sicilia - Italia"
 
+#~ msgid "No data imported."
+#~ msgstr "Nessun dato importato."
+
+#~ msgid "Load Selection"
+#~ msgstr "Carica selezione"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Ricarica la lista di selezione"
+
+#~ msgid "Data Layer"
+#~ msgstr "Livello dati"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr ""
+#~ "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
+
+#~ msgid "Move"
+#~ msgstr "Sposta"
+
+#~ msgid "unnamed"
+#~ msgstr "Senza nome"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "L'estensione del file è sconosciuta."
+
 #~ msgid "The selected way does not contain the selected node."
 #~ msgid_plural "The selected way does not contain all the selected nodes."
 #~ msgstr[0] "Il percorso selezionato non contiene il nodo selezionato."
 #~ msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Gradi Minuti Secondi"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Inserire un commento al caricamento (min. 3 caratteri)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Inserire un commento per questo insieme di modifiche (min. 3 caratteri)"
-
-#~ msgid "No data imported."
-#~ msgstr "Nessun dato importato."
-
-#~ msgid "Load Selection"
-#~ msgstr "Carica selezione"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Ricarica la lista di selezione"
-
-#~ msgid "Data Layer"
-#~ msgstr "Livello dati"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr ""
-#~ "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
-
-#~ msgid "Move"
-#~ msgstr "Sposta"
-
-#~ msgid "unnamed"
-#~ msgstr "Senza nome"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "L'estensione del file è sconosciuta."
 
 #~ msgid "Change"
@@ -35804,4 +36278,7 @@
 #~ msgid "Plugin already exists"
 #~ msgstr "Estensione già esistente"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Gradi Minuti Secondi"
 
 #~ msgid "Only two nodes allowed"
@@ -36192,7 +36669,4 @@
 #~ msgstr "Incorpora comunque"
 
-#~ msgid "Continue anyway"
-#~ msgstr "Continua comunque"
-
 #~ msgid "No intersections found. Nothing was changed."
 #~ msgstr "non è stata trovata nessuna intersezione. Nulla è stato cambiato."
@@ -36671,7 +37145,4 @@
 #~ "estensione non è più necessaria."
 
-#~ msgid "Confirmation"
-#~ msgstr "Conferma"
-
 #~ msgid "Delete all"
 #~ msgstr "Elimina tutto"
@@ -36909,4 +37380,8 @@
 #~ msgstr "Finestra non ancora creata. Invocare prima createInstance()"
 
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Inserire un commento per questo insieme di modifiche (min. 3 caratteri)"
+
 #~ msgid "Error: failed to add authentication credentials to the connection."
 #~ msgstr ""
@@ -37013,4 +37488,7 @@
 #~ msgid "Failed to launch the external help browser"
 #~ msgstr "Fallita l'apertura del browser esterno di aiuto"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Inserire un commento al caricamento (min. 3 caratteri)"
 
 #~ msgid "Object id > 0 expected. Got {0}"
@@ -37173,4 +37651,7 @@
 #~ msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}"
 
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Manca la destinazione dell''unione per l''oggetto con id {0}"
+
 #~ msgid "User with the same uid but different name found"
 #~ msgstr ""
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 22626)
+++ applications/editors/josm/i18n/po/ja.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-02 03:57+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 22:27+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:55+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -28,6 +28,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -124,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -232,4 +232,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -241,4 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -248,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -303,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "キャンセル"
@@ -371,4 +373,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -427,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1386,5 +1389,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1450,4 +1453,53 @@
 msgid "Preferences"
 msgstr "設定"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "調査者..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "バーガー"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "確認"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "セレクションに加える"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1489,4 +1541,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1724,4 +1777,5 @@
 msgstr "簡略化には、少なくとも1つのウェイを選択してください。"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1729,4 +1783,5 @@
 #: ../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 "はい"
@@ -1773,8 +1828,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "現在の選択は分割できません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2982,4 +3036,5 @@
 
 #. 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
@@ -3009,5 +3064,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3220,7 +3275,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "不完全なオブジェクトを削除しようとしています。<br>実際のオブジェクトを見てい"
@@ -3253,10 +3309,5 @@
 msgstr[0] "{0} 個のノードを移動"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "オブジェクト ''{0}'' を取り除いた。"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3264,4 +3315,10 @@
 msgid_plural "Purged {0} objects"
 msgstr[0] "{0}オブジェクトの削除"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "オブジェクト ''{0}'' を取り除いた。"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
@@ -3663,5 +3720,5 @@
 msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3674,6 +3731,6 @@
 "い。これは深刻なエラーではなく、作業を継続しても安全と思われます。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3683,10 +3740,12 @@
 msgstr "ID {0} のウェイの結合対象が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "ID {0} のオブジェクトの結合対象が見つかりません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3694,5 +3753,5 @@
 msgstr "ID {0} のノードの結合対象が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3701,5 +3760,5 @@
 msgstr "ID {0} のリレーションの結合対象が見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3708,4 +3767,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "ID {1} のタイプ {0} の結合対象が見つかりません"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4008,5 +4075,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "鉄道"
@@ -4279,69 +4346,69 @@
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "境界囲みをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "ファイルを開く(ファイル/開くで開かれるファイルの全種類）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "(lat=x&lon=y&zoom=zがついた)URLで示される場所の生gpsをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "言語の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "Javaシステムのプロパティとして提供されるオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "全てのユーザ設定用フォルダを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4354,9 +4421,9 @@
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4365,45 +4432,45 @@
 "パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "--selectionを使った場合、一部のデータだけをロードすることになります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "初期化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "プラグイン更新中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "更新されたプラグインをインストール中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr "未保存のOSMデータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "復元"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4412,14 +4479,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "設定 {0} はもう使われていないので、除かれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4438,10 +4521,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4449,5 +4532,5 @@
 msgstr "ツール"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4455,5 +4538,5 @@
 msgstr "プリセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4464,5 +4547,5 @@
 msgstr "メニュー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "音声"
@@ -4562,17 +4645,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "数値"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "中国料理"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "商用"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5305,5 +5385,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "全て"
@@ -5949,5 +6029,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "リレーション"
@@ -6041,10 +6121,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "関連リストから選択"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
@@ -6650,4 +6730,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7109,5 +7191,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7151,111 +7232,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "名前"
@@ -8334,21 +8416,25 @@
 msgstr "選択中のブックマークの名前を変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "最小経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "最大経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8358,10 +8444,10 @@
 "付けてください）"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "境界囲み"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8370,15 +8456,15 @@
 msgstr "文字列 ''{0}'' は正しいダブル値ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "緯度の値は、[-90,90]の範囲にある必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "経度の値は[-180,180]の範囲で必須です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8527,8 +8613,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "タイプ"
@@ -8557,6 +8643,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "不明な"
@@ -8983,7 +9069,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "不正なアップロードコメント"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9185,7 +9270,9 @@
 msgstr "ファイル名を選択"
 
+#. 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 "いいえ"
@@ -9497,17 +9584,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "不正なアップロードコメント"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "逆順"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "続ける"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9525,7 +9609,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "キャンセルしてエディタに戻る"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9534,7 +9617,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "次回は表示しない"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9737,5 +9819,5 @@
 msgstr[0] "{0} オブジェクトをアップロード中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9926,5 +10008,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "説明"
@@ -11642,5 +11724,5 @@
 msgstr "色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11651,35 +11733,35 @@
 msgstr "全て"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "ローカル・ファイル"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "セグメントがインポートされなかったら、強制的に線を描画する。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "大きなGPS点を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "HDOP（垂直精度劣化度）の値の円を描いてください"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率（赤=高い、緑=低い、可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -11687,5 +11769,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11707,5 +11789,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11747,5 +11829,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11759,65 +11841,70 @@
 msgstr "徒歩"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "ウェイの向きを矢印で表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "一方通行など、必要なときのみ向きを表示"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "アクティブなレイヤー以外は別の色で表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチエイリアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "GPX読み込み時にマーカーを作成。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "作者"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "ディーゼル"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "ボート"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11827,9 +11914,9 @@
 "る。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "GPSトラックのポイント間の線"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11837,34 +11924,34 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。''-1''にすると全てに線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "ローカルファイルに対する最大長 (メートル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "線を描く最大長(m)。''-1''にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決める。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11872,13 +11959,13 @@
 msgstr "これより短いウェイでは方向の矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11888,9 +11975,9 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11898,55 +11985,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "ウエイポイントの記述"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの修正が容易になるように、選択モードで仮想のノードを表示します。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "操作対象とするレイヤー以外のレイヤーを別の色で表示します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSMデータ"
@@ -12317,7 +12403,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "測定するレイヤー"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13211,5 +13296,5 @@
 msgstr "サーバからの応答をパース中..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14888,5 +14973,5 @@
 "は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14917,5 +15002,5 @@
 "動作停止します。"
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15175,5 +15260,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -15628,5 +15713,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "建物"
@@ -15876,5 +15961,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17881,7 +17966,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "解決したバージョン:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18505,13 +18589,13 @@
 msgstr "テラスハウス"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "靴店の編集"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "区切り"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19606,5 +19690,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -21630,5 +21714,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "道路番号"
@@ -22167,5 +22251,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "金属"
@@ -22178,5 +22262,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "森"
@@ -22454,4 +22538,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22480,9 +22626,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "はい"
@@ -22592,9 +22769,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "いいえ"
@@ -23018,5 +23226,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "ハイキング"
@@ -23051,5 +23259,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "中間"
@@ -23063,5 +23271,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -23190,4 +23406,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23219,14 +23443,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "操作員"
@@ -23488,12 +23716,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "高度"
@@ -24348,5 +24576,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "電圧"
@@ -24658,6 +24886,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24709,32 +24939,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -24743,4 +24973,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24793,174 +25024,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "火-日 08:00-15:00; 土 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "燃料の種類:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "ディーゼル"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "バイオ燃料(ディーゼル)"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10%エタノール混合)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85(85%エタノール混合)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPGガス"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "天然ガス"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24990,7 +25222,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "参照番号"
@@ -25006,5 +25238,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "地下"
@@ -25017,6 +25249,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "料金"
@@ -25192,5 +25424,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "車いす"
@@ -25227,6 +25459,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "避難所"
@@ -25234,5 +25466,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "ベンチ"
@@ -25351,5 +25583,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "ビーコン"
@@ -25409,11 +25641,241 @@
 msgstr "ホテルの編集"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "駅"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "電話番号"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "モーテル"
@@ -25421,20 +25883,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -25442,10 +25904,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "ホステル"
@@ -25453,30 +25915,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -25484,10 +25946,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -25498,5 +25960,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -25504,11 +25966,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -25516,78 +25978,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "サンドイッチ"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "寿司"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -25595,17 +26058,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "チキン"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "カフェ"
@@ -25613,9 +26088,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -25623,19 +26099,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "バー"
@@ -25643,9 +26120,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -25653,24 +26131,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "博物館"
@@ -25678,9 +26157,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "動物園"
@@ -25689,9 +26168,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -25699,24 +26178,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "美術館"
@@ -25724,5 +26203,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -25730,19 +26209,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "地形"
@@ -25780,5 +26259,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25786,28 +26265,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "地方"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -25817,5 +26296,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
@@ -25823,5 +26302,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "ハイキング"
@@ -25829,6 +26308,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "サイクリング"
@@ -25836,5 +26315,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -25842,6 +26321,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "スキー"
@@ -25849,5 +26328,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "乗馬"
@@ -25855,54 +26334,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "電柱"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -25910,29 +26388,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -25940,25 +26418,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "城"
@@ -25967,19 +26445,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -25988,9 +26466,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -25998,10 +26476,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "化石サイト"
@@ -26009,5 +26487,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "化石サイトの編集"
@@ -26015,15 +26493,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -26031,55 +26509,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "遊び場"
@@ -26087,35 +26565,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -26129,6 +26607,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -26544,6 +27022,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26578,240 +27056,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "アメリカンフットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "カナディアンフットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr "ゲーリックフットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr "ラグビーリーグ"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr "(通常の)ラグビー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -26853,23 +27331,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "タイプ"
@@ -26911,211 +27389,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -27123,52 +27601,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "射撃"
@@ -27176,163 +27654,163 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr "アメリカンフットボール"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr "アメリカンフットボールを編集"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr "カナディアンフットボール"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr "カナディアンフットボールを編集"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr "ゲーリックフットボール"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr "ゲーリックフットボールを編集"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr "ラグビーリーグ"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr "ラグビーリーグの編集"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr "ラグビー(通常の)"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr "ラグビー(通常の)の編集"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "ペロタ"
@@ -27340,41 +27818,41 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "建物"
@@ -27382,5 +27860,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "公共の建物"
@@ -27388,10 +27866,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "役場"
@@ -27399,10 +27877,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "大使館"
@@ -27410,10 +27888,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "裁判所"
@@ -27422,10 +27900,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "刑務所"
@@ -27434,10 +27912,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "警察"
@@ -27447,10 +27925,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "消防署"
@@ -27459,10 +27937,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "郵便局"
@@ -27470,5 +27948,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -27476,15 +27954,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "学校"
@@ -27492,10 +27970,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "大学"
@@ -27503,10 +27981,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "短大"
@@ -27514,5 +27992,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "短大の編集"
@@ -27520,5 +27998,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "映画館"
@@ -27527,10 +28005,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "図書館"
@@ -27539,9 +28017,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "美術館"
@@ -27549,10 +28027,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "劇場"
@@ -27561,10 +28039,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -27574,5 +28052,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -27581,6 +28059,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "宗教"
@@ -27589,66 +28067,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "宗派"
@@ -27657,81 +28135,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "住所"
@@ -27740,5 +28218,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -27746,5 +28224,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "番地"
@@ -27752,25 +28230,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "ストリートの名前"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "都市名"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "国コード"
@@ -27779,5 +28257,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -27785,61 +28263,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -27847,25 +28325,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "灯台"
@@ -27873,10 +28351,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "風車"
@@ -27884,10 +28362,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -27896,41 +28374,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "ロケーション"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -27940,10 +28418,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "クレーン"
@@ -27951,5 +28429,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "クレーンの編集"
@@ -27957,10 +28435,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -27968,10 +28446,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -27979,23 +28457,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "インドア"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "アウトドア"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "公開"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "発電機"
@@ -28005,35 +28483,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "変電所"
@@ -28042,10 +28520,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -28054,5 +28532,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -28060,10 +28538,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "送電塔"
@@ -28074,23 +28552,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "送電線"
@@ -28099,20 +28577,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28120,55 +28598,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "電力線束のうち良導体の線の数"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "制限"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "電話"
@@ -28177,5 +28655,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -28183,5 +28661,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "コイン"
@@ -28189,5 +28667,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "備考"
@@ -28195,5 +28673,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -28201,5 +28679,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -28207,15 +28685,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "リサイクル"
@@ -28224,5 +28702,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -28230,35 +28708,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "ゴミ箱"
@@ -28266,5 +28744,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "ゴミ箱を編集"
@@ -28273,31 +28751,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "茶"
@@ -28376,5 +28854,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28384,31 +28862,31 @@
 msgstr "緑"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -28417,30 +28895,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "噴水"
@@ -28449,10 +28927,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -28461,10 +28939,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "消火栓"
@@ -28473,5 +28951,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "消火栓を編集"
@@ -28479,5 +28957,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -28485,15 +28963,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "カーディーラ"
@@ -28501,10 +28979,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "自転車屋"
@@ -28513,28 +28991,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -28542,9 +29020,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "キオスク"
@@ -28552,27 +29030,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "本屋"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "精肉店"
@@ -28580,9 +29058,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "パン屋"
@@ -28590,9 +29068,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "生花店"
@@ -28600,18 +29078,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "酒屋"
@@ -28619,54 +29097,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "家電店"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "家具店"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -28674,9 +29152,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "金物屋"
@@ -28684,9 +29162,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -28694,54 +29172,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "文具店"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "靴店"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "ビデオ"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -28749,9 +29227,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "ランドリー"
@@ -28759,9 +29237,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -28769,24 +29247,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -28794,5 +29272,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -28800,97 +29278,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "銀行"
@@ -28898,14 +29376,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "両替"
@@ -28913,5 +29391,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -28919,15 +29397,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "医院"
@@ -28935,18 +29413,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "薬局"
@@ -28954,5 +29432,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -28960,9 +29438,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "病院"
@@ -28970,10 +29448,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -28982,5 +29460,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -28989,20 +29467,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "ポイント名"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "電話番号"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -29010,5 +29483,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "動物病院"
@@ -29017,64 +29490,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "国(country)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "州(state)"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "地方"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "郡"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "郡の編集"
@@ -29082,15 +29555,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "市区"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "町"
@@ -29098,10 +29571,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -29109,25 +29582,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -29135,5 +29608,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "地域"
@@ -29141,10 +29614,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "島"
@@ -29152,10 +29625,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "小島"
@@ -29163,5 +29636,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "小島を編集"
@@ -29169,5 +29642,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -29175,10 +29648,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "山頂"
@@ -29186,10 +29659,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "氷河"
@@ -29197,10 +29670,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "火山"
@@ -29208,70 +29681,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "国境"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "地点名"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "樹木・林"
@@ -29280,15 +29753,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "森"
@@ -29297,5 +29770,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -29303,17 +29776,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "森林"
@@ -29322,14 +29795,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -29337,25 +29810,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "山(Fell)"
@@ -29363,10 +29836,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "荒れ地"
@@ -29374,5 +29847,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -29380,5 +29853,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -29387,45 +29860,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -29433,25 +29906,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "里山"
@@ -29459,10 +29932,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "共有地"
@@ -29470,20 +29943,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -29491,5 +29964,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -29497,15 +29970,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "墓所"
@@ -29513,9 +29986,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -29523,39 +29996,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -29563,15 +30036,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -29579,50 +30052,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
@@ -29632,5 +30105,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -29642,5 +30115,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "外側のセグメント"
@@ -29648,5 +30121,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -29654,5 +30127,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29663,5 +30136,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29669,36 +30142,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29706,5 +30179,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -29713,5 +30186,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -29719,34 +30192,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -29755,15 +30228,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "ウェイへ"
@@ -29771,5 +30244,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "ルート"
@@ -29778,5 +30251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -29784,5 +30257,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "ルート種類"
@@ -29890,5 +30363,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29899,17 +30372,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "スキー"
@@ -29977,5 +30450,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29985,9 +30458,9 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "迂回路"
@@ -30001,10 +30474,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -30012,31 +30485,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -30045,30 +30518,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -31246,16 +31719,4 @@
 msgstr "空路"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "駅"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34174,17 +34635,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "度分秒"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "アップロード用コメントを入力(最小3文字)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
-
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -34717,4 +35165,7 @@
 #~ msgid "rectifier id={0}"
 #~ msgstr "修正子 ID={0}"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "度分秒"
 
 #~ msgid "Downloaded plugin information from {0} site"
@@ -34981,7 +35432,4 @@
 #~ msgid "Please choose a user using the author panel"
 #~ msgstr "著作者パネルを使用してユーザを選んでください。"
-
-#~ msgid "Continue anyway"
-#~ msgstr "とりあえず続ける"
 
 #~ msgid "Change the projection to {0} first."
@@ -35437,7 +35885,4 @@
 #~ "せん。"
 
-#~ msgid "Confirmation"
-#~ msgstr "確認"
-
 #~ msgid "Reached the end of the line"
 #~ msgstr "ラインの終端に到達"
@@ -35489,4 +35934,7 @@
 #~ "プを移動:</b> 右クリックしたままマウスを移動またはカーソルキーを使用。<b>"
 #~ "選択:</b> 左クリックしたままフレームをドロー。"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
 
 #~ msgid "Missing mandatory attribute ''{0}''"
@@ -35769,4 +36217,8 @@
 #~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
+
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
@@ -35833,4 +36285,7 @@
 #~ msgid "Failed to launch the external help browser"
 #~ msgstr "外部ヘルプブラウザの起動に失敗"
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "アップロード用コメントを入力(最小3文字)"
 
 #~ msgid "Id > 0 required, got {0}"
@@ -35998,4 +36453,7 @@
 #~ msgid "Use all their elements"
 #~ msgstr "全て相手の要素を使う"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "ID {0} のオブジェクトの結合対象が見つかりません"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 22626)
+++ applications/editors/josm/i18n/po/nb.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 12:38+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 18:37+0000\n"
 "Last-Translator: Stian Ellingsen <stiell@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 17:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 21:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -224,4 +224,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -233,4 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -240,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -295,5 +297,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Avbryt"
@@ -361,4 +363,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -417,5 +420,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1361,5 +1364,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1424,4 +1427,53 @@
 msgid "Preferences"
 msgstr "Innstillinger"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Surveyor …"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "gatekjøkken"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Indstilling på programtillegg sider"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "legg til i utvalg"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1463,4 +1515,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1697,4 +1750,5 @@
 msgstr "Velg minst én linje å forenkle."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1702,4 +1756,5 @@
 #: ../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 "Ja"
@@ -1748,8 +1803,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Kan ikke splitte med dette utvalget"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2921,4 +2975,5 @@
 
 #. 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
@@ -2948,5 +3003,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3159,8 +3214,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan skape "
+"problemer fordi de kan være i bruk av andre objekter (som du ikke kan se "
+"nå) .<br>Er du sikker på at du vil slette nodene?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3191,10 +3250,5 @@
 msgstr[1] "Flytt {0} noder"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3204,4 +3258,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3584,5 +3644,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3592,6 +3652,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3601,10 +3661,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3612,5 +3674,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3619,5 +3681,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3625,4 +3687,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3919,5 +3989,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "jernbane"
@@ -4191,69 +4261,69 @@
 msgstr "Passord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "bruk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Vis hjelp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix-geometri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Last ned områdeavgrensing"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Last ned områdeavgrensing som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Velg med gitt søkestreng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Start maksimert"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Gå tilbake til standardinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4263,9 +4333,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4273,45 +4343,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Klargjør"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Laster første programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Setter standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Bygger opp hovedskjermbilde"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Laster inn programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4320,14 +4390,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Innstilligen  {0} er fjernet fordi den ikke lenger brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Fil"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4346,10 +4432,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Vis"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4357,5 +4443,5 @@
 msgstr "Verktøy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4363,5 +4449,5 @@
 msgstr "Objektmaler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4372,5 +4458,5 @@
 msgstr "Meny: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4468,17 +4554,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Adkomstvei"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "kinesisk"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Næringsområde"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5215,5 +5298,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "alle"
@@ -5849,5 +5932,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relasjoner"
@@ -5941,10 +6024,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6543,4 +6626,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7002,5 +7087,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7044,111 +7128,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Navn"
@@ -8180,21 +8265,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "maks. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "maks. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8204,10 +8293,10 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Yttergrense for arbeidsområde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8216,15 +8305,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8370,8 +8459,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Type"
@@ -8400,6 +8489,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "ukjent"
@@ -8797,7 +8886,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Skriv inn din merknad"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -8988,7 +9076,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9297,12 +9387,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Reset"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Fortsett"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9328,7 +9416,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Ikke vis igjen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9511,5 +9598,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9690,5 +9777,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Beskrivelse"
@@ -11343,5 +11430,5 @@
 msgstr "Farger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11352,35 +11439,35 @@
 msgstr "Alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Ingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Tegn linjer selv om ingen segmenter ble importert."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Tegn store GPS-punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet  (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (rød = bra, green = dårlig (hvis noen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "En farge (kan tilpasses navngitte lag)"
@@ -11388,5 +11475,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11408,5 +11495,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11448,5 +11535,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11460,64 +11547,70 @@
 msgstr "Til fots"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspiler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig opptegning (ser uryddig ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Bare ved enden av linja."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Tegn segment-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af nedlastede data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle noder i utvalg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i annen farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glatting på kartgrafikk (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Opphavsmann"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Båt"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11525,9 +11618,9 @@
 msgstr "Lag automatisk eget markørlag for waypoints ved åpning av GPX lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11537,9 +11630,9 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11548,10 +11641,10 @@
 "alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11559,10 +11652,10 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11570,5 +11663,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11576,13 +11669,13 @@
 msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11592,9 +11685,9 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Punkt og track linjer får farge etter hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11602,55 +11695,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillater å justere fargen etter gjennomsnittsfarten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "WayPoint Bilde"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningspiler på linjestykker."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en annen farge."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -12019,7 +12111,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Målelag"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12860,5 +12951,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14438,5 +14529,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14463,5 +14554,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14707,5 +14798,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -15154,5 +15245,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Bygninger"
@@ -15393,5 +15484,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17381,7 +17472,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "rett versjon"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18006,13 +18096,13 @@
 msgstr "Terasse"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Rediger sko"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Skilletegn"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19093,5 +19183,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21083,5 +21173,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Veinummer"
@@ -21620,5 +21710,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21631,5 +21721,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "skogsområde"
@@ -21907,4 +21997,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21933,9 +22085,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "ja"
@@ -22045,9 +22228,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "nei"
@@ -22471,5 +22685,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "tur"
@@ -22504,5 +22718,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "middels"
@@ -22516,5 +22730,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22643,4 +22865,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22672,14 +22902,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operatør"
@@ -22941,12 +23175,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Høyde"
@@ -23798,5 +24032,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Spenning"
@@ -24108,6 +24342,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24159,32 +24395,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -24193,4 +24429,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24243,174 +24480,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24440,7 +24677,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Referansenummer"
@@ -24456,5 +24693,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "P-kjeller"
@@ -24467,6 +24704,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Gebyr"
@@ -24642,5 +24879,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -24677,6 +24914,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Ly"
@@ -24684,5 +24921,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Benk"
@@ -24801,5 +25038,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -24859,11 +25096,241 @@
 msgstr "Rediger hotell"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "stasjon"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motell"
@@ -24871,20 +25338,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -24892,10 +25359,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -24903,30 +25370,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -24934,10 +25401,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -24948,5 +25415,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -24954,11 +25421,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -24966,78 +25433,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -25045,17 +25513,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kafé"
@@ -25063,9 +25543,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -25073,19 +25554,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -25093,9 +25575,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -25103,24 +25586,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museum"
@@ -25128,9 +25612,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -25139,9 +25623,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -25149,24 +25633,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -25174,5 +25658,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Rediger kunstverk"
@@ -25180,19 +25664,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Karttype"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "Topografisk"
@@ -25230,5 +25714,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25236,28 +25720,28 @@
 msgstr "Gater"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "Diagram"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Synlig område"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "Sted"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "By"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
@@ -25267,5 +25751,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Ruter for:"
@@ -25273,5 +25757,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Tursti"
@@ -25279,6 +25763,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Sykling"
@@ -25286,5 +25770,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Fjellsykling"
@@ -25292,6 +25776,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Ski"
@@ -25299,5 +25783,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Riding"
@@ -25305,46 +25789,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "… andre typer transport mulig"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Tavleinnhold"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "Merknad"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "Historisk"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "Dyreliv"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "Planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Veiviser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25353,5 +25837,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Informasjonsterminal"
@@ -25359,29 +25843,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Lydomviser"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Lydomvisning via mobiltelefon"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Rediger ly"
@@ -25389,25 +25873,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Bålplass"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Slott"
@@ -25416,19 +25900,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -25437,9 +25921,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -25447,10 +25931,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Paleontologisk sted"
@@ -25458,5 +25942,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Rediger paleontologisk sted"
@@ -25464,15 +25948,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -25480,55 +25964,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Grensestein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Rediger grensestein"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Lekeplass"
@@ -25536,35 +26020,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -25578,6 +26062,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "velg sport:"
@@ -25993,6 +26477,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26027,240 +26511,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -26302,23 +26786,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "type"
@@ -26360,211 +26844,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "sportssenter"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Rediger motorsport"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -26572,52 +27056,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "snøpark"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "fristil"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Skyting"
@@ -26625,204 +27109,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Menneskeskapt"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Bygning"
@@ -26830,5 +27314,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -26836,10 +27320,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Rådhus"
@@ -26847,10 +27331,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Ambassade"
@@ -26858,10 +27342,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Domstol"
@@ -26870,10 +27354,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Fengsel"
@@ -26882,10 +27366,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Politi"
@@ -26895,10 +27379,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -26907,10 +27391,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Postkontor"
@@ -26918,5 +27402,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
@@ -26924,15 +27408,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Skole"
@@ -26940,10 +27424,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Universitet"
@@ -26951,10 +27435,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Høyskole"
@@ -26962,5 +27446,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Rediger høyskole"
@@ -26968,5 +27452,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Kino"
@@ -26975,10 +27459,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Bibliotek"
@@ -26987,9 +27471,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -26997,10 +27481,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teater"
@@ -27009,10 +27493,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -27022,5 +27506,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -27029,6 +27513,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religion"
@@ -27037,66 +27521,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -27105,81 +27589,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adresser"
@@ -27188,5 +27672,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -27194,5 +27678,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Husnummer"
@@ -27200,25 +27684,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Gatenavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Landskode"
@@ -27227,5 +27711,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -27233,61 +27717,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Høyde (meter)"
@@ -27295,25 +27779,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -27321,10 +27805,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -27332,10 +27816,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -27344,41 +27828,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gass"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Område"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -27388,10 +27872,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Kran"
@@ -27399,5 +27883,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Rediger kran"
@@ -27405,10 +27889,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -27416,10 +27900,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -27427,23 +27911,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -27453,35 +27937,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "solcelle"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -27490,10 +27974,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -27502,5 +27986,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -27508,10 +27992,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -27522,23 +28006,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -27547,20 +28031,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27568,55 +28052,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Fasiliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "begrenset"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefon"
@@ -27625,5 +28109,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
@@ -27631,5 +28115,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Mynter"
@@ -27637,5 +28121,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Sedler"
@@ -27643,5 +28127,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -27649,5 +28133,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -27655,15 +28139,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -27672,5 +28156,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -27678,35 +28162,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Klær"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Søppeldunk"
@@ -27714,5 +28198,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Rediger søppeldunk"
@@ -27721,31 +28205,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Ryggstø"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "stein"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Farge"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "svart"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "brun"
@@ -27824,5 +28308,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27832,31 +28316,31 @@
 msgstr "grønn"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "rød"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "blå"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "grå"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "hvit"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Antall seter"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -27865,30 +28349,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fontene"
@@ -27897,10 +28381,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -27909,10 +28393,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -27921,5 +28405,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Rediger hydrant"
@@ -27927,5 +28411,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Babyboks"
@@ -27933,15 +28417,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Rediger babyboks"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Bilforretning"
@@ -27949,10 +28433,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Rediger bilforretning"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Sykkelforretning"
@@ -27961,28 +28445,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelforretning"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Hygiene"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Rediger hygiene"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -27990,9 +28474,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Rediger minimarked"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -28000,27 +28484,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Rediger bokhandel"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Reisebyrå"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Rediger reisebyrå"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Slakter"
@@ -28028,9 +28512,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Baker"
@@ -28038,9 +28522,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Blomster"
@@ -28048,18 +28532,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -28067,54 +28551,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -28122,9 +28606,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -28132,9 +28616,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -28142,54 +28626,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Leker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -28197,9 +28681,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -28207,9 +28691,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -28217,24 +28701,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Automat"
@@ -28242,5 +28726,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -28248,97 +28732,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "fotografier"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "frimerker"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "kuponger"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr "sykkelslanger"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Bank"
@@ -28346,14 +28830,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Rediger bank"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Vekslingssted"
@@ -28361,5 +28845,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Rediger vekslingssted"
@@ -28367,15 +28851,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Lege"
@@ -28383,18 +28867,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -28402,5 +28886,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -28408,9 +28892,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Sykehus"
@@ -28418,10 +28902,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -28430,5 +28914,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -28437,20 +28921,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Navn på punkt"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -28458,5 +28937,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -28465,64 +28944,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Steder"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Kommune"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -28530,15 +29009,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "By"
@@ -28546,10 +29025,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -28557,25 +29036,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -28583,5 +29062,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Lokalitet"
@@ -28589,10 +29068,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Øy"
@@ -28600,10 +29079,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Holme"
@@ -28611,5 +29090,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Rediger holme"
@@ -28617,5 +29096,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -28623,10 +29102,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -28634,10 +29113,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Isbre"
@@ -28645,10 +29124,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Vulkan"
@@ -28656,70 +29135,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Tre"
@@ -28728,15 +29207,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Skogsområde"
@@ -28745,5 +29224,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -28751,17 +29230,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Skog"
@@ -28770,14 +29249,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -28785,25 +29264,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Fjell"
@@ -28811,10 +29290,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Beite"
@@ -28822,5 +29301,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Rediger beite"
@@ -28828,5 +29307,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -28835,45 +29314,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -28881,25 +29360,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Friområde"
@@ -28907,10 +29386,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Offentlig"
@@ -28918,20 +29397,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -28939,5 +29418,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -28945,15 +29424,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -28961,9 +29440,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -28971,39 +29450,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -29011,15 +29490,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militært"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Rediger militært"
@@ -29027,50 +29506,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
@@ -29080,5 +29559,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -29090,5 +29569,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "ytre linjesegment"
@@ -29096,5 +29575,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -29102,5 +29581,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Grense"
@@ -29111,5 +29590,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Rediger grense"
@@ -29117,36 +29596,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Grensetype"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "administrativ"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "nasjonal"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "kommunegrense"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "politisk"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Administrativt nivå"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "Delområde"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Administrativt senter"
@@ -29154,5 +29633,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -29161,5 +29640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -29167,34 +29646,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -29203,15 +29682,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "til linje"
@@ -29219,5 +29698,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Rute"
@@ -29226,5 +29705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -29232,5 +29711,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Rutetype"
@@ -29338,5 +29817,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29347,17 +29826,17 @@
 msgstr "sykkel"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "ski"
@@ -29425,5 +29904,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29433,9 +29912,9 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "omkjøring"
@@ -29449,10 +29928,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -29460,31 +29939,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Rutetilstand"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -29493,30 +29972,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -30694,16 +31173,4 @@
 msgstr "luftfart"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "stasjon"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33622,12 +34089,4 @@
 msgstr "Sicilia, Italia"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Valgt linje inneholder ikke valgt node."
-#~ msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grader, minutter, sekunder"
-
 #~ msgid "Move"
 #~ msgstr "Flytt"
@@ -34127,7 +34586,4 @@
 #~ msgid "Open User Page"
 #~ msgstr "Åpne brukerside"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Fortsett uansett"
 
 #~ msgid "Sorry, doesn't work with anonymous users"
@@ -34303,4 +34759,9 @@
 #~ "historikk.."
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Valgt linje inneholder ikke valgt node."
+#~ msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
+
 #~ msgid "Split way segment"
 #~ msgstr "Splitt linje i segment"
@@ -34395,15 +34856,9 @@
 #~ msgstr "Feil ved tjenerkommunikasjon."
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Du er i ferd med å slette noder utenfor nedlastet område.<br>Dette kan "
-#~ "skape problemer fordi de kan være i bruk av andre objekter (som du ikke "
-#~ "kan se nå) .<br>Er du sikker på at du vil slette nodene?"
-
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Kan ikke åpne innstillingsmappe: {0}"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grader, minutter, sekunder"
 
 #~ msgid "nodes"
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 22626)
+++ applications/editors/josm/i18n/po/nl.po	(revision 22628)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 12:44+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-07 00:27+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -231,4 +231,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -240,4 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -302,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Annuleren"
@@ -369,4 +371,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -425,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1402,5 +1405,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1468,4 +1471,53 @@
 msgid "Preferences"
 msgstr "Voorkeuren"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Surveyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Plugin-site configureren"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "Toevoegen aan selectie"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1507,4 +1559,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1743,4 +1796,5 @@
 msgstr "Selecteer minimaal één weg om te vereenvoudigen."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1748,4 +1802,5 @@
 #: ../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 "Ja"
@@ -1796,8 +1851,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "De huidige selectie kan niet gebruik worden voor splitsen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3022,4 +3076,5 @@
 
 #. 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
@@ -3049,5 +3104,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3264,8 +3319,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
+"gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die je "
+"niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3296,10 +3355,5 @@
 msgstr[1] "Verplaats {0} knooppunten"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Object \"{0}\" verwijderd"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3309,4 +3363,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Object \"{0}\" verwijderd"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3692,5 +3752,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3700,6 +3760,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3709,10 +3769,12 @@
 msgstr "Samenvoeg doel voor weg met id {0} ontbreekt"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Samenvoeg doel voor object met id {0} ontbreekt"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3720,5 +3782,5 @@
 msgstr "Samenvoeg doel voor knooppunt met id {0} ontbreekt"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3727,5 +3789,5 @@
 msgstr "Samenvoeg doel voor relatie met id {0} ontbreekt"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3734,4 +3796,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Samenvoeg doel van type {0} met id {1} ontbreekt"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4027,5 +4097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "spoorweg"
@@ -4301,69 +4371,69 @@
 msgstr "Wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "gebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "opties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Deze hulptekst tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standaard UNIX-geometrieargument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Het omgrensde gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Het omgrensde gebied downloaden als rawe GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Met de opgegeven zoekactie selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Gemaximaliseerd openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "De voorkeuren herstellen op standaardwaarden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4373,9 +4443,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "voorbeelden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4383,45 +4453,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Initialiseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Vroege plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Standaarden instellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Hoofdscherm aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4430,5 +4500,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4437,9 +4507,25 @@
 "gebruikt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Bestand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4458,10 +4544,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Beeld"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4469,5 +4555,5 @@
 msgstr "Gereedschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4475,5 +4561,5 @@
 msgstr "Voorkeuze"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4484,5 +4570,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Geluid"
@@ -4580,17 +4666,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Toegangsweg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "Chinese keuken"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Kantoren"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5301,5 +5384,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "alles"
@@ -5939,5 +6022,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relaties"
@@ -6031,10 +6114,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6635,4 +6718,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7094,5 +7179,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7136,111 +7220,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Naam"
@@ -8272,21 +8357,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8296,10 +8385,10 @@
 "downloaden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Omvattend gebied"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8308,15 +8397,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8463,8 +8552,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Soort"
@@ -8493,6 +8582,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "onbekend"
@@ -8896,7 +8985,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Voer je opmerking in"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9087,7 +9175,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9396,12 +9486,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Herstellen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Doorgaan"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9427,7 +9515,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Niet meer tonen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9612,5 +9699,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9792,5 +9879,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Beschrijving"
@@ -11448,5 +11535,5 @@
 msgstr "Kleuren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11457,35 +11544,35 @@
 msgstr "Alles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Geen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Lijnen altijd tekenen indien er geen segmenten geïmporteerd zijn."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Grote GPS-punten tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Snelheid (rood = langzaam, groen = snel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
@@ -11493,5 +11580,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11513,5 +11600,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11553,5 +11640,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11565,64 +11652,70 @@
 msgstr "Te voet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Teken richting pijlen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Sneltekenen (minder fraai)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Alleen op de kop van een weg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Nummers segmentvolgorde tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Grenzen gedownload gebied tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuele knopen in selectiemodus tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Inactieve lagen in andere kleur tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gladde kaartafbeeldingen (anti-aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Auteur"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Pleziervaart"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11632,9 +11725,9 @@
 "een GPX-laag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11642,9 +11735,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11653,10 +11746,10 @@
 "tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maximum lengte (meters)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11665,10 +11758,10 @@
 "bevatten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11677,5 +11770,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11684,13 +11777,13 @@
 "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de vorige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minimum afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "De GPS-punten groter tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11700,9 +11793,9 @@
 "ingesteld in Laagbeheer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Kleur punten en tracksegmenten op basis van snelheid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11710,37 +11803,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Track- en puntkleuring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Waypoint-afbeelding"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS-punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Richtingwijzers voor wegsegmenten tekenen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -11749,10 +11841,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11760,9 +11852,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "De inactieve gegevenslagen in een andere kleur tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM-gegevens"
@@ -12132,7 +12224,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Laag om in te meten"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12974,5 +13065,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14542,5 +14633,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14567,5 +14658,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14809,5 +14900,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -15256,5 +15347,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Gebouwen"
@@ -15491,5 +15582,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17477,7 +17568,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "samengevoegde versie:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18099,13 +18189,13 @@
 msgstr "Terras"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Schoenenwinkel bewerken"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Scheidingsteken"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19185,5 +19275,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -21160,5 +21250,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Referentie"
@@ -21697,5 +21787,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21708,5 +21798,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "oerbos"
@@ -21984,4 +22074,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22010,9 +22162,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "ja"
@@ -22122,9 +22305,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "nee"
@@ -22548,5 +22762,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22581,5 +22795,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22593,5 +22807,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22720,4 +22942,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22749,14 +22979,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Bedrijf"
@@ -23018,12 +23252,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Stijging"
@@ -23875,5 +24109,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Voltage"
@@ -24185,6 +24419,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24236,32 +24472,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Openingstijden"
@@ -24270,4 +24506,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24320,174 +24557,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24517,7 +24754,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Referentienummer"
@@ -24533,5 +24770,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "ondergronds"
@@ -24544,6 +24781,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Parkeergeld"
@@ -24719,5 +24956,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -24754,6 +24991,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Schuilplaats"
@@ -24761,5 +24998,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Bank"
@@ -24878,5 +25115,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Baken"
@@ -24936,11 +25173,241 @@
 msgstr "Hotel bewerken"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Sterren"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefoonnummer"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -24948,20 +25415,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Pension"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Chalet"
@@ -24969,10 +25436,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Hostel"
@@ -24980,30 +25447,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -25011,10 +25478,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -25025,5 +25492,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -25031,11 +25498,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Keuken"
@@ -25043,78 +25510,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -25122,17 +25590,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Café"
@@ -25140,9 +25620,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Kroeg"
@@ -25150,19 +25631,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr ""
@@ -25170,9 +25652,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -25180,24 +25663,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museum"
@@ -25205,9 +25689,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -25216,9 +25700,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -25226,24 +25710,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -25251,5 +25735,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
@@ -25257,19 +25741,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25307,5 +25791,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25313,28 +25797,28 @@
 msgstr "straat"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25344,5 +25828,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25350,5 +25834,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Wandelen"
@@ -25356,6 +25840,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Fietsen"
@@ -25363,5 +25847,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25369,6 +25853,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Skiën"
@@ -25376,5 +25860,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25382,46 +25866,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "Wild"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25430,5 +25914,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25436,29 +25920,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -25466,25 +25950,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Kasteel"
@@ -25493,19 +25977,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -25514,9 +25998,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -25524,10 +26008,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25535,5 +26019,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25541,15 +26025,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -25557,55 +26041,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Speelveld"
@@ -25613,35 +26097,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -25655,6 +26139,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -26070,6 +26554,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26104,240 +26588,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -26379,23 +26863,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "soort"
@@ -26437,211 +26921,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -26649,52 +27133,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Schieten"
@@ -26702,204 +27186,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Gebouw"
@@ -26907,5 +27391,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -26913,10 +27397,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -26924,10 +27408,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Ambassade"
@@ -26935,10 +27419,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -26947,10 +27431,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Gevangenis"
@@ -26959,10 +27443,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Politie"
@@ -26972,10 +27456,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -26984,10 +27468,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -26995,5 +27479,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -27001,15 +27485,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "School"
@@ -27017,10 +27501,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Universiteit"
@@ -27028,10 +27512,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Campus"
@@ -27039,5 +27523,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -27045,5 +27529,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -27052,10 +27536,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Bibliotheek"
@@ -27064,9 +27548,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -27074,10 +27558,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Theater"
@@ -27086,10 +27570,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -27099,5 +27583,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -27106,6 +27590,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religie"
@@ -27114,66 +27598,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Benaming"
@@ -27182,81 +27666,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adressen"
@@ -27265,5 +27749,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -27271,5 +27755,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Huisnummer"
@@ -27277,25 +27761,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Straatnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Landcode"
@@ -27304,5 +27788,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -27310,61 +27794,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Toren"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27372,25 +27856,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -27398,10 +27882,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Windmolen"
@@ -27409,10 +27893,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -27421,41 +27905,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Locatie"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -27465,10 +27949,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Kraan"
@@ -27476,5 +27960,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
@@ -27482,10 +27966,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -27493,10 +27977,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -27504,23 +27988,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -27530,35 +28014,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -27567,10 +28051,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -27579,5 +28063,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -27585,10 +28069,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -27599,23 +28083,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -27624,20 +28108,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27645,55 +28129,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefoon"
@@ -27702,5 +28186,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -27708,5 +28192,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Munten"
@@ -27714,5 +28198,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Briefgeld"
@@ -27720,5 +28204,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -27726,5 +28210,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -27732,15 +28216,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Recycling"
@@ -27749,5 +28233,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -27755,35 +28239,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27791,5 +28275,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27798,31 +28282,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -27901,5 +28385,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27909,31 +28393,31 @@
 msgstr "groen"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -27942,30 +28426,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Verborgen"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Afgesloten"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fontein"
@@ -27974,10 +28458,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -27986,10 +28470,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27998,5 +28482,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -28004,5 +28488,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -28010,15 +28494,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -28026,10 +28510,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -28038,28 +28522,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr ""
@@ -28067,9 +28551,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -28077,27 +28561,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Slager"
@@ -28105,9 +28589,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Bakker"
@@ -28115,9 +28599,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Bloemist"
@@ -28125,18 +28609,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr ""
@@ -28144,54 +28628,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -28199,9 +28683,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr ""
@@ -28209,9 +28693,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -28219,54 +28703,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak bewerken"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Videotheek"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -28274,9 +28758,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Wasserette"
@@ -28284,9 +28768,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -28294,24 +28778,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -28319,5 +28803,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -28325,97 +28809,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Bank"
@@ -28423,14 +28907,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Bank bewerken"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -28438,5 +28922,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -28444,15 +28928,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Huisarts"
@@ -28460,18 +28944,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -28479,5 +28963,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -28485,9 +28969,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -28495,10 +28979,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -28507,5 +28991,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -28514,20 +28998,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefoonnummer"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -28535,5 +29014,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -28542,64 +29021,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Locaties"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Provincie"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Regio"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr ""
@@ -28607,15 +29086,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Dorp"
@@ -28623,10 +29102,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -28634,25 +29113,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -28660,5 +29139,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr ""
@@ -28666,10 +29145,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Eiland"
@@ -28677,10 +29156,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28688,5 +29167,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28694,5 +29173,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -28700,10 +29179,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Bergtop"
@@ -28711,10 +29190,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -28722,10 +29201,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -28733,70 +29212,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Landsgrens"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Boom"
@@ -28805,15 +29284,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Bos"
@@ -28822,5 +29301,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -28828,17 +29307,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Bosbouw"
@@ -28847,14 +29326,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -28862,25 +29341,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -28888,10 +29367,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Heide"
@@ -28899,5 +29378,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Heide bewerken"
@@ -28905,5 +29384,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -28912,45 +29391,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -28958,25 +29437,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -28984,10 +29463,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Algemeen"
@@ -28995,20 +29474,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -29016,5 +29495,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -29022,15 +29501,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -29038,9 +29517,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -29048,39 +29527,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr ""
@@ -29088,15 +29567,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -29104,50 +29583,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
@@ -29157,5 +29636,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -29167,5 +29646,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "buitensegment"
@@ -29173,5 +29652,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "binnensegment"
@@ -29179,5 +29658,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29188,5 +29667,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29194,36 +29673,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29231,5 +29710,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -29238,5 +29717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -29244,34 +29723,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -29280,15 +29759,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "naar weg"
@@ -29296,5 +29775,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr ""
@@ -29303,5 +29782,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr ""
@@ -29309,5 +29788,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr ""
@@ -29415,5 +29894,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29424,17 +29903,17 @@
 msgstr "fiets"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "straat"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "veerboot"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29502,5 +29981,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29510,9 +29989,9 @@
 msgstr "voet"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "omweg"
@@ -29526,10 +30005,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29537,31 +30016,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Netwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "voorgesteld"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternatief"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "tijdelijk"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "verbinding"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Kleur (hex)"
@@ -29570,30 +30049,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30771,16 +31250,4 @@
 msgstr "luchtverbinding"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33699,12 +34166,4 @@
 msgstr "Sicilië - Italië"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "De geselecteerde weg bevat niet de geselecteerde knoop."
-#~ msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Graden minuten seconden"
-
 #~ msgid "Select a bookmark first."
 #~ msgstr "Selecteer eerst een bladwijzer."
@@ -33960,6 +34419,14 @@
 #~ msgstr "Wegsegment splitsen"
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Graden minuten seconden"
+
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "De geselecteerde weg bevat niet de geselecteerde knoop."
+#~ msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
 
 #~ msgid "Parsing error in URL: \"{0}\""
@@ -34316,13 +34783,4 @@
 
 #~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Je staat op het punt knopen te verwijderen buiten het gebied dat je hebt "
-#~ "gedownload.<br>Dit kan problemen veroorzaken omdat andere objecten (die "
-#~ "je niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
-
-#~ msgid ""
 #~ "The selected ways have differing relation memberships.  Do you still want "
 #~ "to combine them?"
@@ -34631,7 +35089,4 @@
 #~ msgstr "Onjuiste projectie"
 
-#~ msgid "Continue anyway"
-#~ msgstr "Toch doorgaan"
-
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
@@ -34815,4 +35270,7 @@
 #~ "Tenminste één object benodigd voor verwijderen, kreeg lege verzameling"
 
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Samenvoeg doel voor object met id {0} ontbreekt"
+
 #~ msgid "The \"from\" way does not start or end at a \"via\" node."
 #~ msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop."
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 22626)
+++ applications/editors/josm/i18n/po/pl.po	(revision 22628)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 11:29+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 21:04+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -29,6 +29,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -124,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -233,4 +233,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -242,4 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -249,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -304,5 +306,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Anuluj"
@@ -370,4 +372,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -426,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1390,5 +1393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1455,4 +1458,53 @@
 msgid "Preferences"
 msgstr "Ustawienia"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Przygotowywanie..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburgery"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Konfiguracja stron wtyczek"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "dodaj do zaznaczenia"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1494,4 +1546,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1729,4 +1782,5 @@
 msgstr ""
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1734,4 +1788,5 @@
 #: ../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 "Tak"
@@ -1782,8 +1837,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2974,4 +3028,5 @@
 
 #. 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
@@ -3001,5 +3056,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3215,8 +3270,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to spowodowac "
+"problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą używać tych "
+"węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3248,10 +3307,5 @@
 msgstr[2] "Przesunięto {0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3260,4 +3314,10 @@
 msgstr[0] ""
 msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
@@ -3657,5 +3717,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3668,6 +3728,6 @@
 "jest krytyczny błąd i powinien być bezpieczny dla kontynuowania pracy."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3677,10 +3737,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3688,5 +3750,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3695,5 +3757,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3701,4 +3763,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3998,5 +4068,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "tory kolejowe"
@@ -4266,69 +4336,69 @@
 msgstr "Hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "użycie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "opcje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Wyświetl tę pomoc"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Przywróć domyślne ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Zmień folder dla ustawień wszystkich użytkowników."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4338,9 +4408,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "przykłady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4348,45 +4418,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Inicjalizacja"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Ładowanie wczesnych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Zapisywanie domyślnych ustawień"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Przygotowywanie interfejsu użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Ładowanie wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4395,14 +4465,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Plik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4421,10 +4507,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Widok"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4432,5 +4518,5 @@
 msgstr "Narzędzia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4438,5 +4524,5 @@
 msgstr "Szablony"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4447,5 +4533,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Dźwięk"
@@ -4543,17 +4629,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "droga serwisowa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "chińska"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "biura i usługi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5284,5 +5367,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "wszystkie"
@@ -5929,5 +6012,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relacje"
@@ -6021,10 +6104,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Zaznacz na liście relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6626,4 +6709,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7085,5 +7170,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7127,111 +7211,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nazwa"
@@ -8274,21 +8359,25 @@
 msgstr "Zmień nazwę zakładki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min szer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min dł."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max szer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max dł."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8297,10 +8386,10 @@
 "Adres URL z www.openstreetmap.org (można wkleić adres aby pobrać obszar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Wybrany obszar"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8309,15 +8398,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8464,8 +8553,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Rodzaj"
@@ -8494,6 +8583,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "nieznany"
@@ -8879,7 +8968,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Wpisz swój komentarz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9070,7 +9158,9 @@
 msgstr ""
 
+#. 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 "Nie"
@@ -9382,12 +9472,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Resetuj"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Kontynuuj"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9405,7 +9493,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Przechodzi do poprzedniej strony"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9414,7 +9501,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Nie pokazuj ponownie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9597,5 +9683,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9780,5 +9866,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Opis"
@@ -11422,5 +11508,5 @@
 msgstr "Kolory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11431,35 +11517,35 @@
 msgstr "wszystkie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "pliki lokalne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "żadne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Wymuszaj rysowanie linii jeżeli nie zaimportowano odcinków."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Rysuj duże punkty GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Prędkość (czerwony = wolno, zielony = szybko)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11467,5 +11553,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11487,5 +11573,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11527,5 +11613,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11539,65 +11625,70 @@
 msgstr "Ruch pieszy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Rysuj strzałki kierunkowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Szybsze rysowanie (wygląda gorzej)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Tylko na początku drogi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Numeruj kolejne segmenty dróg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Rysuj granicę obszaru pobranych danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Zaznaczaj nieaktywne warstwy innym kolorem"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesel (olej napędowy)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Łódka"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11605,9 +11696,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Rysuj linie pomiędzy punktami GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11617,9 +11708,9 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Maksymalna długość dla plików lokalnych (w metrach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11628,10 +11719,10 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maksymalna długość (w metrach)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11640,10 +11731,10 @@
 "liniach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11652,5 +11743,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11658,13 +11749,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minimalna odległość (w pikselach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Rysuj większe kropki dla punktów GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11672,9 +11763,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11682,55 +11773,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Punkty GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rysuje granice obszaru danych pobranych z serwera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Dane OSM"
@@ -12960,5 +13051,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14553,5 +14644,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14579,5 +14670,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14821,5 +14912,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -15268,5 +15359,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Budynki"
@@ -15503,5 +15594,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17454,7 +17545,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "Połączona wersja"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18072,13 +18162,13 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Edycja sklepu obuwniczego"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Separator"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19158,5 +19248,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr ""
@@ -21115,5 +21205,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Numer"
@@ -21652,5 +21742,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "metal"
@@ -21663,5 +21753,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "drewno"
@@ -21939,4 +22029,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21965,9 +22117,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "tak"
@@ -22077,9 +22260,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "nie"
@@ -22503,5 +22717,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22536,5 +22750,5 @@
 msgstr "dobra"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "średnia"
@@ -22548,5 +22762,13 @@
 msgstr "tragiczna"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22675,4 +22897,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22704,14 +22934,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operator"
@@ -22973,12 +23207,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Wysokość"
@@ -23830,5 +24064,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Napięcie"
@@ -24140,6 +24374,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24191,32 +24427,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Godziny otwarcia"
@@ -24225,4 +24461,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24275,174 +24512,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr "Kiosk"
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Rodzaje paliwa:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesel (olej napędowy)"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Biodiesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Ultimate Diesel (GTL)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel dla ciężarówek"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "Benzyna bezołowiowa 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "Benzyna bezołowiowa 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "Benzyna bezołowiowa 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "Benzyna bezołowiowa 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (bioetanol 10%)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (bioetanol 85%)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "Gaz LPG"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "Gaz CNG (sprężony gaz ziemny)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr "Kiosk"
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24472,7 +24709,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Numer referencyjny"
@@ -24488,5 +24725,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "podziemny"
@@ -24499,6 +24736,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Opłata"
@@ -24674,5 +24911,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Dla niepełnosprawnych"
@@ -24709,6 +24946,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "schronienie"
@@ -24716,5 +24953,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "ławka"
@@ -24833,5 +25070,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -24891,11 +25128,241 @@
 msgstr "Edycja hotelu"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Gwiazdki"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "Terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Numer telefonu"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "motel"
@@ -24903,20 +25370,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Edycja motelu"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "kwatera"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Edycja kwatery turystycznej"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "chata górska"
@@ -24924,10 +25391,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Edycja chaty górskiej"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "hostel"
@@ -24935,30 +25402,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Edycja hostelu"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "chata alpejska"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Edycja chaty alpejskiej"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "kemping"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Edycja kempingu"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "pole namiotowe"
@@ -24966,10 +25433,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Edycja pola namiotowego"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -24980,5 +25447,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "restauracja"
@@ -24986,11 +25453,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Edycja restauracji"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Kuchnia"
@@ -24998,78 +25465,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "włoska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "francuska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "kanapki"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "fast food"
@@ -25077,17 +25545,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "ryba z frytkami"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "kurczak"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -25095,9 +25575,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Edycja kawiarni"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "pub"
@@ -25105,19 +25586,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Edycja pubu"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "bar"
@@ -25125,9 +25607,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Edycja baru"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -25135,24 +25618,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Edycja klubu nocnego"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "muzeum"
@@ -25160,9 +25644,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Edycja muzeum"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "zoo"
@@ -25171,9 +25655,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Edycja zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -25181,24 +25665,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "wieża widokowa"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "park rozrywki"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Edycja parku rozrywki"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "sztuka"
@@ -25206,5 +25690,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Edycja obiektu sztuki"
@@ -25212,19 +25696,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "informacja turystyczna"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Szczegółowość"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topograficzna"
@@ -25262,5 +25746,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25268,28 +25752,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "schemat"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Obszar"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "miejsce"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "miasto"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Opis"
@@ -25299,5 +25783,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Zaznaczone szlaki:"
@@ -25305,5 +25789,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "turystyka piesza"
@@ -25311,6 +25795,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "kolarstwo"
@@ -25318,5 +25802,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "kolarstwo górskie"
@@ -25324,6 +25808,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -25331,5 +25815,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "jeździectwo"
@@ -25337,54 +25821,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "...możliwe inne rodzaje transportu"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "tablica informacyjna"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Zawartość"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "tablica informacyjna"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "tablica botaniczna"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "drogowskaz"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "słup"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "terminal informacyjny"
@@ -25392,29 +25875,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Opis"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "audioprzewodnik"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Audioprzewodnik dostępny przez telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Numer telefonu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "inny punkt informacyjny"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Edycja schronienia"
@@ -25422,25 +25905,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "miejsce na ognisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "miejsce na piknik"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Edycja miejsca na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "zamek"
@@ -25449,19 +25932,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "wykopalisko archeologiczne"
@@ -25470,9 +25953,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Edycja wykopaliska archeologicznego"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "pole bitwy"
@@ -25480,10 +25963,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Edycja pola bitwy"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "wykopalisko paleontologiczne"
@@ -25491,5 +25974,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Edycja wykopaliska paleontologicznego"
@@ -25497,15 +25980,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "pomnik"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -25513,55 +25996,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "kamień graniczny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Edycja kamienia granicznego"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "plac zabaw"
@@ -25569,35 +26052,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Obiekty sportowe"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -25611,6 +26094,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -26026,6 +26509,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26060,240 +26543,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "futbol australijski"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "sport rakietowy"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "boisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Edycja minigolfa"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Edycja różnych sportów"
@@ -26335,23 +26818,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "rodzaj"
@@ -26393,211 +26876,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "boisko"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "centrum sportowe"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "ścieżka"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "kręgle"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Edycja wyścigów konnych"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Edycja gimnastyki"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "sporty motorowe"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Edycja sportów motorowych"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Edycja łyżwiarstwa"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Edycja jazdy na deskorolce"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Edytuj pływanie"
@@ -26605,52 +27088,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "dla ekspertów"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -26658,204 +27141,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "bule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Budowle"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "budynek"
@@ -26863,5 +27346,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -26869,10 +27352,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "ratusz"
@@ -26880,10 +27363,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "ambasada"
@@ -26891,10 +27374,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "sąd"
@@ -26903,10 +27386,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "więzienie"
@@ -26915,10 +27398,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "posterunek policji"
@@ -26928,10 +27411,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -26940,10 +27423,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Edycja straży pożarnej"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "poczta"
@@ -26951,5 +27434,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -26957,15 +27440,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "szkoła"
@@ -26973,10 +27456,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "uniwersytet"
@@ -26984,10 +27467,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "college"
@@ -26995,5 +27478,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -27001,5 +27484,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "kino"
@@ -27008,10 +27491,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "biblioteka"
@@ -27020,9 +27503,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -27030,10 +27513,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "teatr"
@@ -27042,10 +27525,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -27055,5 +27538,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -27062,6 +27545,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religia"
@@ -27070,66 +27553,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -27138,81 +27621,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adresy"
@@ -27221,5 +27704,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Edycja informacji o adresach"
@@ -27227,5 +27710,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Numer domu"
@@ -27233,25 +27716,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Nazwa ulicy"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Kod kraju"
@@ -27260,5 +27743,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Edycja interpolacji adresów"
@@ -27266,61 +27749,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alfabetycznie"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "wieża"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Typ wieży"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "komunikacyjna"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "obserwacyjna"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Wysokość (metry)"
@@ -27328,25 +27811,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -27354,10 +27837,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "wiatrak"
@@ -27365,10 +27848,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -27377,41 +27860,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gazowy"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "ciepłowniczy"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "naftowy"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "ściekowy"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "różne substancje"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Położenie"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "podwodny"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "nadziemy"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -27421,10 +27904,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "dźwig"
@@ -27432,5 +27915,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
@@ -27438,10 +27921,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -27449,10 +27932,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "monitoring"
@@ -27460,23 +27943,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "wewnętrzny"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "zewnętrzny"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "publiczny"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "elektrownia"
@@ -27486,35 +27969,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Edycja elektowni"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "rozdzielnia elektryczna"
@@ -27523,10 +28006,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Edycja rozdzielni elektrycznej"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "stacja transformatorowa"
@@ -27535,5 +28018,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Edycja stacji transformatorowej"
@@ -27541,10 +28024,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -27555,23 +28038,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Edycja słupa elektrycznego"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "wieża"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "słup"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Numer referencyjny"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -27580,20 +28063,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Rodzaj linii"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27601,55 +28084,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Liczba kabli"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Liczba przewodów w jednym kablu"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "pojedynczy"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "podwójny"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "potrójny"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "poczwórny"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Udogodnienia"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "toalety"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limitowane"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "telefon"
@@ -27658,5 +28141,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -27664,5 +28147,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "na monety"
@@ -27670,5 +28153,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "na banknoty"
@@ -27676,5 +28159,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -27682,5 +28165,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -27688,15 +28171,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -27705,5 +28188,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -27711,35 +28194,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "kosz na śmieci"
@@ -27747,5 +28230,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Edycja kosza na śmieci"
@@ -27754,31 +28237,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Oparcie"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Materiał"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "kamień"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plastik"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Kolor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "czarny"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "brązowy"
@@ -27857,5 +28340,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27865,31 +28348,31 @@
 msgstr "zielony"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "czerwony"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "niebieski"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "szary"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "biały"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Pojemność"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
@@ -27898,30 +28381,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "niska"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "połowiczna"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "pełna"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Ukryj"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "fontanna"
@@ -27930,10 +28413,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -27942,10 +28425,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "hydrant"
@@ -27954,5 +28437,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Edycja hydrantu"
@@ -27960,5 +28443,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "okno życia"
@@ -27966,15 +28449,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Edycja okna życia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Sklepy"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "dealer samochodowy"
@@ -27982,10 +28465,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Edycja warsztatu samochodowego"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "sklep rowerowy"
@@ -27994,28 +28477,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Edycja warsztatu rowerowego"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Edycja supermarketu"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "drogeria"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Edycja drogerii"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "sklep osiedlowy"
@@ -28023,9 +28506,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Edycja sklepu osiedlowego"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "kiosk"
@@ -28033,27 +28516,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Edycja kiosku"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "księgarnia"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Edycja księgarni"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "biuro podróży"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Edycja biura podróży"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "rzeźnik"
@@ -28061,9 +28544,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Edycja sklepu mięsnego"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "piekarnia"
@@ -28071,9 +28554,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Edycja piekarni"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "kwiaciarnia"
@@ -28081,18 +28564,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Edycja kwiaciarni"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "naturalna żywność"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Edycja sklepu z naturalną żywnością"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "sklep monopolowy"
@@ -28100,54 +28583,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Edycja sklepu monopolowego"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "sklep z napojami"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Edycja sklepu z napojami"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "sklep komputerowy"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Edycja sklepu komputerowego"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "sklep elektroniczny"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Edycja sklepu elektronicznego"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "sprzęt hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Edycja sklepu ze sprzętem hi-fi"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "meble"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Edycja sklepu meblowego"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "centrum ogrodnicze"
@@ -28155,9 +28638,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Edycja centrum ogrodniczego"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "sklep z narzędziami"
@@ -28165,9 +28648,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Edycja sklepu z narzędziami"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "sklep DIY"
@@ -28175,54 +28658,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Edycja sklepu DIY (zrób to sam)"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "artykuły biurowe"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Edycja sklepu z artykułami biurowymi"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "fryzjer"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Edycja salonu fryzjerskiego"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "obuwniczy"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Edycja sklepu obuwniczego"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "zabawki"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Edycja sklepu z zabawkami"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "wypożyczalnia wideo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Edycja wypożyczalni wideo"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "pralnia chemiczna"
@@ -28230,9 +28713,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Edycja palni chemicznej"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "pralnia samoobsługowa"
@@ -28240,9 +28723,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "wyspa"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "sklep turystyczny"
@@ -28250,24 +28733,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Edycja sklepu ze sprzętem turystycznym"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Edycja sklepu sportowego"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "optyk"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Edycja optyka"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -28275,5 +28758,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Edycja automatu sprzedającego"
@@ -28281,97 +28764,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "vouchery"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "torby na odchody"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "bank"
@@ -28379,14 +28862,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Edycja banku"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "kantor"
@@ -28394,5 +28877,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Edycja kantoru"
@@ -28400,15 +28883,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "lekarz"
@@ -28416,18 +28899,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Edycja lekarza"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "apteka"
@@ -28435,5 +28918,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Edycja apteki"
@@ -28441,9 +28924,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "realizacja recept"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "szpital"
@@ -28451,10 +28934,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr ""
@@ -28463,5 +28946,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28470,20 +28953,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Numer telefonu"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -28491,5 +28969,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -28498,64 +28976,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Miejsca"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "kontynent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "kraj"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Edycja kraju"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "stan"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "okręg"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
@@ -28563,15 +29041,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "miasto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "małe miasto"
@@ -28579,10 +29057,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "dzielnica"
@@ -28590,25 +29068,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "wieś"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "przysiółek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
@@ -28616,5 +29094,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "okolica"
@@ -28622,10 +29100,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "wyspa"
@@ -28633,10 +29111,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Edycja wyspy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "wysepka"
@@ -28644,5 +29122,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Edycja wysepki"
@@ -28650,5 +29128,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -28656,10 +29134,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Edycja wejścia do jaskini"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "wzgórze"
@@ -28667,10 +29145,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Edycja wzgórza"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "lodowiec"
@@ -28678,10 +29156,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Edycja lodowca"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "wulkan"
@@ -28689,70 +29167,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Edycja wulkanu"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "narodowa"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "cywilna"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Edycja granicy cywilnej"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "polityczna"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "park narodowy"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "drzewo"
@@ -28761,15 +29239,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "las pierwotny"
@@ -28778,5 +29256,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Edycja lasu pierwotnego"
@@ -28784,17 +29262,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "iglasty"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "las"
@@ -28803,14 +29281,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Edycja lasu"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
@@ -28818,25 +29296,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "rumowisko"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Edycja rumowiska"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "busz"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Edycja buszu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "hala górska"
@@ -28844,10 +29322,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Edycji hali górskiej"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "wrzosowisko"
@@ -28855,5 +29333,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Edycja wrzosowiska"
@@ -28861,5 +29339,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "zagroda"
@@ -28868,45 +29346,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "łąka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -28914,25 +29392,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "ogród"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "trawa"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "zieleń miejska"
@@ -28940,10 +29418,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Edycja zieleni miejskiej"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -28951,20 +29429,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "teren rekreacyjny"
@@ -28972,5 +29450,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -28978,15 +29456,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -28994,9 +29472,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -29004,39 +29482,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "handel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Teren kolejowy"
@@ -29044,15 +29522,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Obszar wojskowy"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -29060,50 +29538,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Budowa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "teren poprzemysłowy"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Edycja terenu poprzemysłowego"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Teren pod zabudowę"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Wysypisko"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
@@ -29113,5 +29591,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Edycja multipolygonu"
@@ -29123,5 +29601,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "Zewnętrzny segment"
@@ -29129,5 +29607,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "Wewnętrzny segment"
@@ -29135,5 +29613,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "granica"
@@ -29144,5 +29622,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Edycja granicy"
@@ -29150,36 +29628,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Rodzaj granicy"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "administracyjna"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "narodowa"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "cywilna"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "polityczna"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Poziom administracyjny"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "Podobszary"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Centrum administracyjne"
@@ -29187,5 +29665,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -29194,5 +29672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -29200,34 +29678,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "zakaz skrętu w lewo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "zakaz skrętu w prawo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -29236,15 +29714,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "do drogi"
@@ -29252,5 +29730,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "trasa"
@@ -29259,5 +29737,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Edytuj trasę"
@@ -29265,5 +29743,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Typ trasy"
@@ -29371,5 +29849,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29380,17 +29858,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "droga"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29458,5 +29936,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29466,9 +29944,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "objazd"
@@ -29482,10 +29960,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -29493,31 +29971,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -29526,30 +30004,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30727,16 +31205,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "Terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33655,13 +34121,4 @@
 msgstr "Sycylia - Włochy"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Wybrana droga nie zawiera wybranego węzła."
-#~ msgstr[1] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
-#~ msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Stopnie minuty sekundy"
-
 #~ msgid "Move"
 #~ msgstr "Przenieś"
@@ -33898,7 +34355,4 @@
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Proszę zgłosić bład pod adresem {0}"
-
-#~ msgid "Preparing..."
-#~ msgstr "Przygotowywanie..."
 
 #~ msgid "Tags (empty value deletes tag)"
@@ -34064,4 +34518,7 @@
 #~ msgstr "różne"
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Stopnie minuty sekundy"
+
 #~ msgid "Split way segment"
 #~ msgstr "Rozdziel segmenty drogi"
@@ -34086,4 +34543,10 @@
 #~ "Wybierz przynajmniej jedną lub więcej zamkniętych dróg o co najmniej "
 #~ "czterech węzłach."
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Wybrana droga nie zawiera wybranego węzła."
+#~ msgstr[1] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
+#~ msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
 
 #~ msgid "Please enter a search string"
@@ -34356,13 +34819,4 @@
 #~ msgid "Can't search because there is no loaded data."
 #~ msgstr "Nie mogę szukać ponieważ nie załadowano danych."
-
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Zamierzasz usunąć węzły spoza obszaru, który pobrano.<br>Może to "
-#~ "spowodowac problem, ponieważ inne (niewidoczne dla ciebie) obiekty mogą "
-#~ "używać tych węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 22626)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-02 17:05+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-12 20:12+0000\n"
 "Last-Translator: Rodrigo de Avila <rodrigo@avila.net.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:57+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -232,4 +232,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -241,4 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -248,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -303,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Cancelar"
@@ -369,4 +371,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -425,5 +428,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1401,5 +1404,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1468,4 +1471,53 @@
 msgid "Preferences"
 msgstr "Preferências"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Preparando..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hambúrguer"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Confirmação"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "adiciona à seleção"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1507,4 +1559,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1743,4 +1796,5 @@
 msgstr "Por favor, selecione ao menos um caminho para simplificar."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1748,4 +1802,5 @@
 #: ../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 "Sim"
@@ -1794,8 +1849,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "A seleção atual não pode ser usada para divisões"
+msgstr ""
+"A seleção atual não pode ser usada para separação - não há nó selecionado."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3033,4 +3088,5 @@
 
 #. 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
@@ -3060,5 +3116,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "Aceitar"
@@ -3276,7 +3332,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Você está a ponto de apagar objetos incompletos. <br> Isto irá causar "
@@ -3311,10 +3368,5 @@
 msgstr[1] "Mover {0} nós"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Eliminado objeto ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3324,4 +3376,10 @@
 msgstr[1] "{0} objetos eliminados"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Eliminado objeto ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3692,5 +3750,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "deg° min'' sec\""
-msgstr ""
+msgstr "deg° min'' sec\""
 
 #. *
@@ -3699,5 +3757,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "deg° min'' (Nautical)"
-msgstr ""
+msgstr "deg° min'' (Náutica)"
 
 #. *
@@ -3736,5 +3794,5 @@
 "incluída"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3748,6 +3806,6 @@
 "trabalho."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3757,10 +3815,12 @@
 msgstr "Faltando alvo de mescla para caminho com id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Faltando alvo de mescla para objeto com id {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3768,5 +3828,5 @@
 msgstr "Faltando alvo de mescla para nó com id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3775,5 +3835,5 @@
 msgstr "Faltando alvo de mescla para relação com id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3782,4 +3842,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Faltando alvo de mescla para tipo {0} com id {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4088,5 +4156,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "ferrovia"
@@ -4361,29 +4429,29 @@
 msgstr "Senha"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "opções"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Mostar essa ajuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Argumento padrão de geometria unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Baixar o retângulo limite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4391,41 +4459,41 @@
 "Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Baixar o retângulo limite como dados de gps brutos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z) como dados raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Selecionar dentro da busca"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Executar em modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Resetar preferência para default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Definir o idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "opções providas como propriedades do sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/TRILHA/PARA/PASTA/DO/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Alterar o diretório para todas as configurações de usuário"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4439,9 +4507,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4451,45 +4519,45 @@
 "ordem."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Tenha certeza de que irá carregar algum dado, caso use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Inicializando"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Atualizando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Instalando plugins atualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Carregando plugins anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Aplicando padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Criando tela principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Carregando plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr "Dado osm não salvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "Restaurar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4500,14 +4568,33 @@
 "caiu na última vez. Você quer restaurar os dados?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Configuração {0} das preferências foi removida pois não é mais usada."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+"<h2>JOSM necessita do Java versão 6.</h2>Versão do Java detectada: {0}."
+"<br>Você pode <ul><li>atualizar seu Java (JRE) ou</li><li>usar uma versão "
+"anterior (compatível com Java 5) do JOSM.</li></ul>Mais informação:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr "Sair do JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr "Continuar, tentar assim mesmo"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Arquivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4526,10 +4613,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Vista"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4537,5 +4624,5 @@
 msgstr "Ferramentas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4543,5 +4630,5 @@
 msgstr "Predefinições"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4552,5 +4639,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Audio"
@@ -4650,17 +4737,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Numérico"
+msgstr "Métrico"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "chinessa"
+msgstr "Chinês"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Comercial"
+msgstr "Imperial"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5417,5 +5501,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "todos os números"
@@ -6090,5 +6174,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relações"
@@ -6182,10 +6266,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Selecionar na lista de relações"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Selecionar uma relação na lista de relações"
@@ -6801,4 +6885,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7260,5 +7346,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7302,111 +7387,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nome"
@@ -8536,21 +8622,25 @@
 msgstr "Renomear o favorito selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "lat mín"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "lon mín"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "lat máx"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "lon máx"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8560,10 +8650,10 @@
 "área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Retângulo Limite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8572,15 +8662,15 @@
 msgstr "A String \"{0}\" não é um valor double válido."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Requerido valor de latitude no intervalo [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Requerido valor de longitude no intervalo [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8733,8 +8823,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Tipo"
@@ -8763,6 +8853,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "Desconhecido"
@@ -9192,7 +9282,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Comentário de envio inválido"
+msgstr "Escreva um comentário de envio"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9403,7 +9492,9 @@
 msgstr "Selecionar nome de arquivo"
 
+#. 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 "Não"
@@ -9736,17 +9827,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Comentário de envio inválido"
+msgstr "Por favor, revise o comentário de envio"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Inverter"
+msgstr "Revisar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Continuar"
+msgstr "Continuar como está"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9758,22 +9846,27 @@
 "explain your change, you will make life<br />easier for many other mappers."
 msgstr ""
+"Seu comentário de envio está <i>vazio</i>, ou <i>é muito curto</i>.<br /"
+"><br />Isto é tecnicamente permitido, mas por favor considere que muito "
+"usuários que estão<br />vendo as modificações em suas áreas dependem de "
+"comentários com descrições  razoáveis <br />para entender o que está "
+"acontecendo!<br /><br />Se você puder gastar um minuto explicando suas "
+"alterações, fará a vida dos <br />outros mapeadores mais fácil."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
 msgid "Return to the previous dialog to enter a more descriptive comment"
 msgstr ""
+"Retornar ao diálogo anterior para escrever um comentário mais descritivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Clique para voltar para Diálogo de Envio"
+msgstr "Cancelar e retornar ao diálogo anterior"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
 msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Ignorar esta dica e enviar da mesma forma"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Não mostrar novamente"
+msgstr "Não mostrar esta mensagem novamente"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9986,5 +10079,5 @@
 msgstr[1] "Enviando {0} objetos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10183,5 +10276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Descrição"
@@ -10838,6 +10931,6 @@
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} foi encontrado para ser etiquetado com GPS"
+msgstr[1] "{0} foram encontrados para serem etiquetados com GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:647
@@ -11920,5 +12013,5 @@
 msgstr "Cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11929,35 +12022,35 @@
 msgstr "Tudo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Arquivos locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Nenhum"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forçar linhas se nenhum segmento for importado."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Desenhe pontos GPS grandes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Desenha um círculo com valor HDOP."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermelho = lento, verde = rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Diluição da posição (vermelho = alta, verde = baixo, se disponível)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Cor única (pode ser personalizado para camadas nomeadas)"
@@ -11965,5 +12058,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11985,5 +12078,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12025,5 +12118,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12037,65 +12130,70 @@
 msgstr "A Pé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Desenhar setas de direção"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Desenhar rápido (vai parecer feio)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Somente sugestões de sentido interessantes (ex. tag de mão única)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Somente no sentido da via."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Desenhar número de sequência dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Desenhar os limites dos dados recebidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Desenhar nós virtuais no modo escollhido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Desenhar camadas inativas em cor diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gráficos do mapa suavizados (anti-alias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Criar marcadores quando ler um arquivo GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Diesel"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Barco"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12105,9 +12203,9 @@
 "abrir um camada GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Desenhar linhas entre os pontos GPS brutos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12117,9 +12215,9 @@
 "\"-1\" para desenhar todas as linhas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Tamanho máximo para arquivos locais (em metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12128,10 +12226,10 @@
 "todas as linhas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Tamanho máximo (em metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12140,10 +12238,10 @@
 "informações de linha."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Desenha setas de direção para linhas, conectando pontos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12152,5 +12250,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12159,13 +12257,13 @@
 "Não desenha a seta se ela não estiver a pelo menos esta distância da última."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Distância mínima (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenha pontos grandes para os pontos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12175,9 +12273,9 @@
 "personalizado no Gerenciador de Camadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Pontos coloridos e segmentos de trilha por velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12187,54 +12285,54 @@
 "equipamento de captura precisa registrar essas informações."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Permita ajustar a cor da trilha para diferentes médias de velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Coloração de trilhas e pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Pontos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Desenhar sugestões de direção para os segmentos de trilha."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Desenhar as camadas de dados inativas em uma cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Dados OSM"
@@ -12607,7 +12705,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Medições"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13488,5 +13585,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -15080,5 +15177,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15107,5 +15204,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15360,5 +15457,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpolação de Endereços"
@@ -15807,5 +15904,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Construções"
@@ -16044,5 +16141,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17997,7 +18094,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "Versão mesclada"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18622,13 +18718,13 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Editar Loja de Sapatos"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Separador"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19740,5 +19836,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -21711,5 +21807,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Referência"
@@ -22248,5 +22344,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -22259,5 +22355,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "madeira"
@@ -22535,4 +22631,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22561,9 +22719,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "sim"
@@ -22673,9 +22862,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "não"
@@ -23099,5 +23319,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "caminhada"
@@ -23132,5 +23352,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -23144,5 +23364,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -23271,4 +23499,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23300,14 +23536,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operador"
@@ -23569,12 +23809,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Altitude"
@@ -24426,5 +24666,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Voltagem"
@@ -24736,6 +24976,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24787,32 +25029,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Horário de Funcionamento"
@@ -24821,4 +25063,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24871,174 +25114,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Seg-Sex 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Ter-Dom 08:00-15:00; Sáb 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Tipos de combustíveis:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Biodísel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25068,7 +25312,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Número de Referência"
@@ -25084,5 +25328,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr ""
@@ -25095,6 +25339,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Taxa"
@@ -25270,5 +25514,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Cadeira de Rodas"
@@ -25305,6 +25549,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Abrigo"
@@ -25312,5 +25556,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Banco"
@@ -25429,5 +25673,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr ""
@@ -25487,11 +25731,241 @@
 msgstr "Editar Hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Número de telefone"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -25499,20 +25973,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Editar Motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr ""
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Chalé"
@@ -25520,10 +25994,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Editar Chalé"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Albergue"
@@ -25531,30 +26005,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Editar Albergue"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Local de Camping"
@@ -25562,10 +26036,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Editar Local de Camping"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Comida e Bebida"
@@ -25576,5 +26050,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -25582,11 +26056,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Editar Restaurante"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Cozinha"
@@ -25594,78 +26068,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "chinessa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hambúrguer"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "grega"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "alemã"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiática"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "tailandesa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexicana"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japonesa"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Lanchonete"
@@ -25673,17 +26148,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar Lanchonete Fast-Food"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Café"
@@ -25691,9 +26178,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Editar Café"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Bar/Pub"
@@ -25701,19 +26189,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Editar Bar/Pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar"
@@ -25721,9 +26210,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Boate"
@@ -25731,24 +26221,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Editar Boate"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Atração"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Editar Atração Turística"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museu"
@@ -25756,9 +26247,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Editar Museu"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoológico"
@@ -25767,9 +26258,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Editar Zoológico"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Mirante"
@@ -25777,24 +26268,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Editar Mirante"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Parque Temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Editar Parque Temático"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Arte"
@@ -25802,5 +26293,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Editar Arte"
@@ -25808,19 +26299,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Centro de Informações Turísticas"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25858,5 +26349,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25864,28 +26355,28 @@
 msgstr "estrada"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "cidade"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "região"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25895,5 +26386,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25901,5 +26392,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr ""
@@ -25907,6 +26398,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -25914,5 +26405,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -25920,6 +26411,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Esqui"
@@ -25927,5 +26418,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25933,54 +26424,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... outros modos de transporte possíveis"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Quadro de Informações"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "vida selvagem"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "polo"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25988,29 +26478,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Outros Pontos de Informação"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Editar Abrigo"
@@ -26018,25 +26508,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Lareira"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Campo de Picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Editar Campo de Picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Lugares Históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Castelo"
@@ -26045,19 +26535,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Editar Castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Editar Ruínas"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Sítio Arqueológico"
@@ -26066,9 +26556,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Editar Sítio Arqueológico"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Campo de Batalha"
@@ -26076,10 +26566,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Editar Campo de Batalha"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -26087,5 +26577,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -26093,15 +26583,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Editar Monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Memorial"
@@ -26109,55 +26599,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Editar Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Editar Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Lazer"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Parque Aquático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Editar Parque Aquático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Parquinho"
@@ -26165,35 +26655,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Editar Parquinho"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Pescaria"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Editar Pescaria"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Esportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Estádio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Editar Estádio"
@@ -26207,6 +26697,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "selecionar esporte:"
@@ -26622,6 +27112,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26656,240 +27146,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "arco e flecha"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "futebol australiano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basquete"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "boliche"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "canoagem"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "críquete"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "corrida de cachorros"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golfe"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "ginástica olímpica"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hóquei"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "corrida de cavalos"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "automobilismo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "esqui"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "futebol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "natação"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "ping-pong"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tênis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Editar Centro de Esportes"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Mini-Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Editar Mini-Golf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26931,23 +27421,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "tipo"
@@ -26989,211 +27479,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "estádio"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr ""
@@ -27201,52 +27691,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Dificuldade"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr ""
@@ -27254,204 +27744,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Futebol Australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Editar Futebol Australiano"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Editar Campo de Baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basquetebol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Editar Basquetebol"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Editar Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Críquete"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Editar Críquete"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Editar Hockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Tênis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Editar Tênis de Mesa"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Editar Tênis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Construção humana"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Edificação"
@@ -27459,5 +27949,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Prédio Público"
@@ -27465,10 +27955,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Editar Prédio Público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Prefeitura"
@@ -27476,10 +27966,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Editar Prefeitura"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Embaixada"
@@ -27487,10 +27977,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Fórum"
@@ -27499,10 +27989,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Editar Fórum"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Presídio"
@@ -27511,10 +28001,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Editar Presídio"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Polícia"
@@ -27524,10 +28014,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Editar Polícia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Bombeiros"
@@ -27536,10 +28026,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Editar Bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Correios"
@@ -27547,5 +28037,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Editar Correios"
@@ -27553,15 +28043,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Creche"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Editar Creche"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Escola"
@@ -27569,10 +28059,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Editar Escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Universidade"
@@ -27580,10 +28070,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Editar Universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Faculdade"
@@ -27591,5 +28081,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Editar Faculdade"
@@ -27597,5 +28087,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Cinema"
@@ -27604,10 +28094,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Editar Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Biblioteca"
@@ -27616,9 +28106,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Editar Biblioteca"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Centro de Artes"
@@ -27626,10 +28116,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Editar Centro de Artes"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teatro"
@@ -27638,10 +28128,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Editar Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Lugar de Adoração"
@@ -27651,5 +28141,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Editar Lugar de Adoração"
@@ -27658,6 +28148,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religião"
@@ -27666,66 +28156,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "budismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "cristianismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hinduísmo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jainismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "judaísmo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "muçulmano"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikhismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "espiritismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoísmo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrianismo"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Denominação"
@@ -27734,81 +28224,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglicana"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "batista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "católica"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangélica"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "testemunha de jeová"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luterana"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mórmon"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbiteriana"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "xiismo"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunismo"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Endereços"
@@ -27817,5 +28307,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Editar Informações de Endereço"
@@ -27823,5 +28313,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Número da casa"
@@ -27829,25 +28319,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Nome do rua"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "CEP"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Código do país"
@@ -27856,5 +28346,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Editar Interpolação de Endereços"
@@ -27862,61 +28352,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Esquema de numeração"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "números ímpares"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "números pares"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Construção humana"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Editar Fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Editar Torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "comunicação"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "observação"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Altura (metros)"
@@ -27924,25 +28414,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Torre de Água"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Editar Torre de Água"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasômetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Editar Gasômetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Farol"
@@ -27950,10 +28440,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Editar Farol"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Moinho de Vento"
@@ -27961,10 +28451,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Editar Moinho de Vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Cano"
@@ -27973,41 +28463,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Editar Cano"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "gás"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "calor"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "petróleo"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "qualquer substância"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Localidade"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "subaquático"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Estação de Tratamento de Esgoto"
@@ -28017,10 +28507,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Editar Estação de Tratamento de Esgoto"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Guindaste"
@@ -28028,5 +28518,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Editar Guindaste"
@@ -28034,10 +28524,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
@@ -28045,10 +28535,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Editar Vértice Geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Câmera de Vigilância"
@@ -28056,23 +28546,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Editar Câmera de Vigilância"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Gerador de Energia"
@@ -28082,35 +28572,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Editar Gerador de Energia"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "eólica"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hidrelétrica"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fóssil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "carvão"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "carvão"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Estação de Energia"
@@ -28119,10 +28609,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Editar Estação de Energia"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Subestação de Energia"
@@ -28131,5 +28621,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Editar Subestação de Energia"
@@ -28137,10 +28627,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Torre de Energia"
@@ -28151,23 +28641,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Editar Torre de Energia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "polo"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Linha de transmissão"
@@ -28176,20 +28666,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Editar Linha de Transmissão"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Tipo de Linha de Transmissão"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28197,55 +28687,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Quantidade de Cabos"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de cabos (ou condutores) por cabo-de-força"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "simples"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "duplo"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "triplo"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "quádruplo"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Comodidades"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Banheiros"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Caixa de Correio"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefone"
@@ -28254,5 +28744,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Editar Telefone"
@@ -28260,5 +28750,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Moedas"
@@ -28266,5 +28756,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Notas"
@@ -28272,5 +28762,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Carteiras Eletrónicas ou Cartões pré-pagos"
@@ -28278,5 +28768,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Cartões de Débito"
@@ -28284,15 +28774,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Cartão de Crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Cartão Telefônico"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Reciclagem"
@@ -28301,5 +28791,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Editar Centro de Reciclagem"
@@ -28307,35 +28797,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Baterias"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Ferro Velho"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Cesta de Lixo"
@@ -28343,5 +28833,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Editar Cesta de Lixo"
@@ -28350,31 +28840,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "rocha"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "preto"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "marrom"
@@ -28453,5 +28943,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28461,31 +28951,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "vermelho"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "cinza"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "branco"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Número de Assentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28494,30 +28984,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "metade"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "cheio"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Ocutar"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Bloquear"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Chafariz"
@@ -28526,10 +29016,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Editar Chafariz"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Bebedouro"
@@ -28538,10 +29028,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Editar Bebedouro"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Hidrante"
@@ -28550,5 +29040,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Editar Hidrante"
@@ -28556,5 +29046,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Berçário"
@@ -28562,15 +29052,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Editar Berçário"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Lojas"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Concessionária"
@@ -28578,10 +29068,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Editar Loja de Carros"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Casa de Bicicleta"
@@ -28590,28 +29080,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Editar Loja de Bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Editar Supermercado"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Loja de Conveniência"
@@ -28619,9 +29109,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Editar Loja de Conveniência"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Quiosque"
@@ -28629,27 +29119,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Editar Quiosque"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Livraria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Editar Livraria"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Agência de Viagem"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Editar Agência de Viagem"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Açougue"
@@ -28657,9 +29147,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Editar Açougue"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Padaria"
@@ -28667,9 +29157,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Editar Padaria"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Floricultura"
@@ -28677,18 +29167,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Editar Floricultura"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Orgânicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Editar Loja de Orgânicos"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Álcool"
@@ -28696,54 +29186,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Editar"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Editar Loja de Bebidas"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Computador"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Editar Loja de Computador"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Eletrônicos"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Editar Loja de Eletrônicos"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Equipamentos de Áudio"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Editar Loja de Equipamentos de Áudio"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Móveis"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Editar Loja de Móveis"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Loja de Plantas"
@@ -28751,9 +29241,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Editar Loja de Plantas"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Componente físico"
@@ -28761,9 +29251,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Editar Loja de Utilidades Domésticas"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Loja de Ferragens"
@@ -28771,54 +29261,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar Loja de Ferragens"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Papelaria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Editar Papelaria"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Cabelereiro"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Editar Cabelereiro"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Sapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Editar Loja de Sapatos"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Brinquedos"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Editar Loja de Brinquedos"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Locadora de Vídeo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Editar Locadora de Vídeo"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Lavanderia à Seco"
@@ -28826,9 +29316,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Editar Lavanderia à Seco"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -28836,9 +29326,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Editar Lavanderia"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -28846,24 +29336,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Editar Loja de Esportes"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Óculos"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Editar Loja de Óculos"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr ""
@@ -28871,5 +29361,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Editar Máquina de Vendas"
@@ -28877,97 +29367,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Produtos à venda"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "tíquetes de transporte público"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "mapas de transporte público"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "tíquetes de estacionamento"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "comida"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "bebidas"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "cigarros"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "ração animal"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "jornais"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "brinquedos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "Cartões SIM"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "vales"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "preservativos"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "absorventes"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "sacos para fezes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Cartões de fidelidade"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Dinheiro"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banco"
@@ -28975,14 +29465,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Editar Banco"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Caixa Eletrônico"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Loja de Câmbio"
@@ -28990,5 +29480,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Editar Loja de Câmbio"
@@ -28996,15 +29486,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixa Eletrônico"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Médicos"
@@ -29012,18 +29502,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Editar Médicos"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Dentistas"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Editar Dentistas"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Farmácia"
@@ -29031,5 +29521,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Editar Farmácia"
@@ -29037,9 +29527,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Hospital"
@@ -29047,10 +29537,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Editar Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Entrada de Emergência"
@@ -29059,5 +29549,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Editar Entrada de Emergência"
@@ -29066,20 +29556,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Número do Ponto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Número de telefone"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use código internacional, como +12-345-67890)"
@@ -29087,5 +29572,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -29094,64 +29579,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Editar Veterinária"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Editar Continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Editar País"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Estado"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Editar Estado"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Região"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Editar Região"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Condado"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Editar Condado"
@@ -29159,15 +29644,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Cidade"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Editar Cidade (mais que 100 mil habitantes)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Cidade (menos que 100 mil habitantes)"
@@ -29175,10 +29660,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Editar Cidade (menos que 100 mil habitantes)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Bairro"
@@ -29186,25 +29671,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Editar Bairro"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Vilarejo"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Editar Vilarejo"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr ""
@@ -29212,5 +29697,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Localidade"
@@ -29218,10 +29703,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Editar Localidade"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Ilha"
@@ -29229,10 +29714,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Editar Ilha"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Ilhota"
@@ -29240,5 +29725,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Editar Ilhota"
@@ -29246,5 +29731,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Entrada de Caverna"
@@ -29252,10 +29737,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Editar Entrada de Caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Pico"
@@ -29263,10 +29748,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Editar Pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Geleira"
@@ -29274,10 +29759,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Editar Geleira"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Vulcão"
@@ -29285,70 +29770,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Editar Vulcão"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Editar Fronteiras Nacionais"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Editar Fronteiras Administrativas"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Editar Fronteiras Civis"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Editar Fronteiras Políticas"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Parque nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Editar Fronteira de Parque Nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Uso da terra"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Árvore"
@@ -29357,15 +29842,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Editar Árvore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Nome Botânico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Floresta"
@@ -29374,5 +29859,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Editar Floresta"
@@ -29380,17 +29865,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "decídua"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "misturado"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Floresta"
@@ -29399,14 +29884,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Editar zona Florestal"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -29414,25 +29899,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Arbusto"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Editar arbusto"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -29440,10 +29925,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Editar rocha"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Matagal"
@@ -29451,5 +29936,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Editar matagal"
@@ -29457,5 +29942,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Fazenda"
@@ -29464,45 +29949,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Terra agrícola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Editar zona Agrícola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vinhedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Editar zona de Vinhedos"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Hortas comunitárias"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29510,25 +29995,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Jardim"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Editar Jardim"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Grama"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Editar zona de Gramado"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -29536,10 +30021,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Comum"
@@ -29547,20 +30032,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Editar Parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "área de recreação"
@@ -29568,5 +30053,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29574,15 +30059,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Editar zona Residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Cemitério"
@@ -29590,9 +30075,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Editar Cemitério"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Cemitério"
@@ -29600,39 +30085,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Editar zona de Cemitério"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Comércio"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Editar zona Comercial"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Editar zona Comercial"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Editar zona Industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr ""
@@ -29640,15 +30125,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Editar zona Militar"
@@ -29656,50 +30141,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Área de construção"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Editar zona para Construção"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Aterro"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Editar Aterro"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Pedreira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -29709,5 +30194,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -29719,5 +30204,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "segmento externo"
@@ -29725,5 +30210,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "segmento interno"
@@ -29731,5 +30216,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29740,5 +30225,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29746,36 +30231,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29783,5 +30268,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Restrição de manobra"
@@ -29790,5 +30275,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Editar restrição de manobras"
@@ -29796,34 +30281,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Restrição"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "proibida_conversão_esquerda"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "proibida_conversão_direita"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "proibido_em_frente"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "proibido_retornar"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "somente_a_direita"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "somente_a_esquerda"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "somente_em_frente"
@@ -29832,15 +30317,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "do caminho"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "nó de via ou caminho"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "para caminho"
@@ -29848,5 +30333,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Rota"
@@ -29855,5 +30340,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Editar Rota"
@@ -29861,5 +30346,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Tipo de rota"
@@ -29967,5 +30452,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29976,17 +30461,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "ônibus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "estrada"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "barca"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "Esqui"
@@ -30054,5 +30539,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30062,9 +30547,9 @@
 msgstr "a pé"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "bonde/VLT"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "desvio"
@@ -30078,10 +30563,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "Metrô"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Descrição de símbolo"
@@ -30089,31 +30574,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "alternativa"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "temporário"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "conexão"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Cor (hex)"
@@ -30122,30 +30607,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "segmento de rota"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "segmento em frente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "Ponto de parada"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "ponto de parada em frente"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "ponto de parada atrás"
@@ -31323,16 +31808,4 @@
 msgstr "aerovia"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34251,23 +34724,4 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "O caminho selecionado não contém o nó selecionado."
-#~ msgstr[1] "O caminho selecionado não contém todos nós selecionados."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Graus Minutos Segundos"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Digite um comentário de envio (mín. de 3 caracteres)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Por gentile digite um comentário para este conjunto de mudanças (mínomo 3 "
-#~ "caracteres)"
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparando..."
-
 #~ msgid "Uploading..."
 #~ msgstr "Enviando..."
@@ -34424,4 +34878,7 @@
 #~ "Não transfira nenhum dado após esta mensagem."
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Graus Minutos Segundos"
+
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
@@ -34588,4 +35045,9 @@
 #~ msgid "An error occurred while saving."
 #~ msgstr "Ocorreu um erro durante o salvamento."
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "O caminho selecionado não contém o nó selecionado."
+#~ msgstr[1] "O caminho selecionado não contém todos nós selecionados."
 
 #~ msgid "aqueduct"
@@ -34947,7 +35409,4 @@
 #~ msgstr "Valores Predefinidos"
 
-#~ msgid "Continue anyway"
-#~ msgstr "Continuar assim mesmo"
-
 #~ msgid "Physically delete from local dataset"
 #~ msgstr "Eliminar fisicamente os dados locais"
@@ -35066,7 +35525,4 @@
 #~ "Habilitar para envio de todas modificações em uma chamada, desabilitar "
 #~ "para usar uma chamada por primitiva"
-
-#~ msgid "Confirmation"
-#~ msgstr "Confirmação"
 
 #~ msgid "Delete all"
@@ -35222,4 +35678,7 @@
 #~ msgstr "Valor incorreto de operador de versão: {0}. Número é esperado."
 
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Faltando alvo de mescla para objeto com id {0}"
+
 #~ msgid "Apply also for children"
 #~ msgstr "Aplicar também para filhos"
@@ -35253,4 +35712,7 @@
 #~ "</b> Segure o botão direito do mouse e mova-o ou use as setas do teclado. "
 #~ "<b>Selecionar:</b> Segure o botão esquerdo do mouse e desenhe a área."
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Digite um comentário de envio (mín. de 3 caracteres)"
 
 #~ msgid ""
@@ -35296,4 +35758,9 @@
 #~ "<br> Isto pode causar problemas, já que outros objetos que você não pode "
 #~ "ver podem estar usando estes pontos.<br> Deseja realmente apagar?"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Por gentile digite um comentário para este conjunto de mudanças (mínomo 3 "
+#~ "caracteres)"
 
 #~ msgctxt "filter"
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 22626)
+++ applications/editors/josm/i18n/po/ro.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 11:36+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-07 00:33+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:59+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -29,6 +29,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -124,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -226,4 +226,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -235,4 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -242,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -297,5 +299,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Anulează"
@@ -363,4 +365,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -419,5 +422,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1365,5 +1368,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1428,4 +1431,51 @@
 msgid "Preferences"
 msgstr "Preferinţe"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Purge..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "Fuzionează"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+msgid "Confirm Purging"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "adaugă la selecţie"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1467,4 +1517,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1700,4 +1751,5 @@
 msgstr ""
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1705,4 +1757,5 @@
 #: ../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 ""
@@ -2893,4 +2946,5 @@
 
 #. 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
@@ -2920,5 +2974,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3129,5 +3183,5 @@
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 
@@ -3159,10 +3213,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3172,4 +3221,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3548,5 +3603,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3556,6 +3611,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3565,10 +3620,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3576,5 +3633,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3583,5 +3640,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3589,4 +3646,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3885,5 +3950,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr ""
@@ -4151,69 +4216,69 @@
 msgstr "Parolă"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "utilizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "opţiuni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Arată acest ajutor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Argument geometrie unix standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Descarcă perimetrul selectat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Selectează cu căutarea dată"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Restabileşte preferinţele implicite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4223,9 +4288,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "exemple"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4233,45 +4298,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Se creează interfața grafică"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4280,14 +4345,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4306,10 +4387,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Vizualizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4317,5 +4398,5 @@
 msgstr "Unelte"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4323,5 +4404,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4332,5 +4413,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr ""
@@ -4432,7 +4513,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "Alegeţi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
@@ -5144,5 +5224,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr ""
@@ -5782,5 +5862,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr ""
@@ -5874,10 +5954,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6476,4 +6556,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6935,5 +7017,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6977,111 +7058,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Nume"
@@ -8114,21 +8196,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8136,10 +8222,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8148,15 +8234,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8301,8 +8387,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr ""
@@ -8331,6 +8417,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "necunoscut"
@@ -8903,7 +8989,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9212,12 +9300,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Revizie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Continuă"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9427,5 +9513,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9606,5 +9692,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr ""
@@ -11223,5 +11309,5 @@
 msgstr "Culori"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11232,35 +11318,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Forţează linii dacă nu a fost importat nici un segment."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Desenează puncte GPS mari."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11268,5 +11354,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11288,5 +11374,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11328,5 +11414,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11340,63 +11426,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Desenează săgeţi direcţionale"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Despre"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11404,9 +11497,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11414,19 +11507,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11435,15 +11528,15 @@
 "despre linii."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11451,13 +11544,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenează puncte mai pari pentru punctele GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11465,9 +11558,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11475,54 +11568,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Date OSM"
@@ -12732,5 +12825,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14289,5 +14382,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14314,5 +14407,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14549,5 +14642,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr ""
@@ -14996,5 +15089,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr ""
@@ -15231,5 +15324,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17793,10 +17886,10 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+msgid "Edit SeaMap Symbols"
+msgstr ""
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
 msgstr ""
@@ -18874,5 +18967,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr ""
@@ -20824,5 +20917,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr ""
@@ -21361,5 +21454,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21372,5 +21465,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr ""
@@ -21648,4 +21741,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21674,9 +21829,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr ""
@@ -21786,9 +21972,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr ""
@@ -22212,5 +22429,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22245,5 +22462,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22257,5 +22474,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22384,4 +22609,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22413,14 +22646,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr ""
@@ -22682,12 +22919,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr ""
@@ -23539,5 +23776,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr ""
@@ -23849,6 +24086,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -23900,32 +24139,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr ""
@@ -23934,4 +24173,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -23984,174 +24224,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24181,7 +24421,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr ""
@@ -24197,5 +24437,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr ""
@@ -24208,6 +24448,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr ""
@@ -24383,5 +24623,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr ""
@@ -24418,6 +24658,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr ""
@@ -24425,5 +24665,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr ""
@@ -24542,5 +24782,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr ""
@@ -24600,11 +24840,241 @@
 msgstr ""
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr ""
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr ""
@@ -24612,20 +25082,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr ""
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr ""
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr ""
@@ -24633,10 +25103,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr ""
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr ""
@@ -24644,30 +25114,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr ""
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr ""
@@ -24675,10 +25145,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr ""
@@ -24689,5 +25159,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -24695,11 +25165,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr ""
@@ -24707,78 +25177,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr ""
@@ -24786,17 +25257,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr ""
@@ -24804,9 +25287,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr ""
@@ -24814,19 +25298,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr ""
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr ""
@@ -24834,9 +25319,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr ""
@@ -24844,24 +25330,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr ""
@@ -24869,9 +25356,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr ""
@@ -24880,9 +25367,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr ""
@@ -24890,24 +25377,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr ""
@@ -24915,5 +25402,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr ""
@@ -24921,19 +25408,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -24971,5 +25458,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24977,28 +25464,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25008,5 +25495,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25014,5 +25501,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr ""
@@ -25020,6 +25507,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr ""
@@ -25027,5 +25514,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25033,6 +25520,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr ""
@@ -25040,5 +25527,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25046,46 +25533,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25094,5 +25581,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25100,29 +25587,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr ""
@@ -25130,25 +25617,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr ""
@@ -25157,19 +25644,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr ""
@@ -25178,9 +25665,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr ""
@@ -25188,10 +25675,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25199,5 +25686,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25205,15 +25692,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr ""
@@ -25221,55 +25708,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr ""
@@ -25277,35 +25764,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr ""
@@ -25319,6 +25806,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr ""
@@ -25734,6 +26221,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -25768,240 +26255,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26043,23 +26530,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr ""
@@ -26101,211 +26588,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr ""
@@ -26313,52 +26800,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr ""
@@ -26366,204 +26853,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr ""
@@ -26571,5 +27058,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr ""
@@ -26577,10 +27064,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr ""
@@ -26588,10 +27075,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr ""
@@ -26599,10 +27086,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr ""
@@ -26611,10 +27098,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr ""
@@ -26623,10 +27110,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr ""
@@ -26636,10 +27123,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr ""
@@ -26648,10 +27135,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr ""
@@ -26659,5 +27146,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr ""
@@ -26665,15 +27152,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr ""
@@ -26681,10 +27168,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr ""
@@ -26692,10 +27179,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr ""
@@ -26703,5 +27190,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr ""
@@ -26709,5 +27196,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr ""
@@ -26716,10 +27203,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr ""
@@ -26728,9 +27215,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr ""
@@ -26738,10 +27225,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr ""
@@ -26750,10 +27237,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr ""
@@ -26763,5 +27250,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr ""
@@ -26770,6 +27257,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr ""
@@ -26778,66 +27265,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr ""
@@ -26846,81 +27333,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr ""
@@ -26929,5 +27416,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr ""
@@ -26935,5 +27422,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr ""
@@ -26941,25 +27428,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr ""
@@ -26968,5 +27455,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -26974,61 +27461,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr ""
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27036,25 +27523,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr ""
@@ -27062,10 +27549,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr ""
@@ -27073,10 +27560,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr ""
@@ -27085,41 +27572,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr ""
@@ -27129,10 +27616,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr ""
@@ -27140,5 +27627,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr ""
@@ -27146,10 +27633,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr ""
@@ -27157,10 +27644,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr ""
@@ -27168,23 +27655,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr ""
@@ -27194,35 +27681,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr ""
@@ -27231,10 +27718,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr ""
@@ -27243,5 +27730,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27249,10 +27736,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr ""
@@ -27263,23 +27750,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr ""
@@ -27288,20 +27775,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27309,55 +27796,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr ""
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr ""
@@ -27366,5 +27853,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr ""
@@ -27372,5 +27859,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr ""
@@ -27378,5 +27865,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr ""
@@ -27384,5 +27871,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27390,5 +27877,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr ""
@@ -27396,15 +27883,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr ""
@@ -27413,5 +27900,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr ""
@@ -27419,35 +27906,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27455,5 +27942,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27462,31 +27949,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -27565,5 +28052,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27573,31 +28060,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27606,30 +28093,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr ""
@@ -27638,10 +28125,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr ""
@@ -27650,10 +28137,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27662,5 +28149,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27668,5 +28155,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -27674,15 +28161,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27690,10 +28177,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27702,28 +28189,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr ""
@@ -27731,9 +28218,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr ""
@@ -27741,27 +28228,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr ""
@@ -27769,9 +28256,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr ""
@@ -27779,9 +28266,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr ""
@@ -27789,18 +28276,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr ""
@@ -27808,54 +28295,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr ""
@@ -27863,9 +28350,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr ""
@@ -27873,9 +28360,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -27883,54 +28370,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr ""
@@ -27938,9 +28425,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr ""
@@ -27948,9 +28435,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr ""
@@ -27958,24 +28445,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr ""
@@ -27983,5 +28470,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr ""
@@ -27989,97 +28476,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr ""
@@ -28087,14 +28574,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr ""
@@ -28102,5 +28589,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr ""
@@ -28108,15 +28595,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr ""
@@ -28124,18 +28611,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr ""
@@ -28143,5 +28630,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr ""
@@ -28149,9 +28636,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr ""
@@ -28159,10 +28646,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr ""
@@ -28171,5 +28658,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28178,20 +28665,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr ""
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28199,5 +28681,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr ""
@@ -28206,64 +28688,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr ""
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr ""
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr ""
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr ""
@@ -28271,15 +28753,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr ""
@@ -28287,10 +28769,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr ""
@@ -28298,25 +28780,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr ""
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr ""
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr ""
@@ -28324,5 +28806,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr ""
@@ -28330,10 +28812,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr ""
@@ -28341,10 +28823,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28352,5 +28834,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28358,5 +28840,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr ""
@@ -28364,10 +28846,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr ""
@@ -28375,10 +28857,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr ""
@@ -28386,10 +28868,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr ""
@@ -28397,70 +28879,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr ""
@@ -28469,15 +28951,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr ""
@@ -28486,5 +28968,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr ""
@@ -28492,17 +28974,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr ""
@@ -28511,14 +28993,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -28526,25 +29008,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -28552,10 +29034,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr ""
@@ -28563,5 +29045,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr ""
@@ -28569,5 +29051,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr ""
@@ -28576,45 +29058,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28622,25 +29104,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -28648,10 +29130,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr ""
@@ -28659,20 +29141,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr ""
@@ -28680,5 +29162,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -28686,15 +29168,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr ""
@@ -28702,9 +29184,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr ""
@@ -28712,39 +29194,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr ""
@@ -28752,15 +29234,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28768,50 +29250,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -28821,5 +29303,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28831,5 +29313,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr ""
@@ -28837,5 +29319,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr ""
@@ -28843,5 +29325,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -28852,5 +29334,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -28858,36 +29340,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -28895,5 +29377,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr ""
@@ -28902,5 +29384,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -28908,34 +29390,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr ""
@@ -28944,15 +29426,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr ""
@@ -28960,5 +29442,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr ""
@@ -28967,5 +29449,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr ""
@@ -28973,5 +29455,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr ""
@@ -29079,5 +29561,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29088,17 +29570,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29166,5 +29648,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29174,9 +29656,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29190,10 +29672,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29201,31 +29683,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr ""
@@ -29234,30 +29716,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30435,16 +30917,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr ""
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 22626)
+++ applications/editors/josm/i18n/po/ru.po	(revision 22628)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-02 07:22+0000\n"
-"Last-Translator: J-Wills <Unknown>\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-12 13:14+0000\n"
+"Last-Translator: PAN <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -28,6 +28,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -123,6 +123,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -232,4 +232,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -241,4 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -248,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -303,5 +305,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Отмена"
@@ -371,4 +373,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -427,5 +430,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1406,5 +1409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1474,4 +1477,53 @@
 msgid "Preferences"
 msgstr "Настройки"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Землемер…"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "бутерброды"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Подтверждение"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "добавить к выделению"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1513,4 +1565,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1750,4 +1803,5 @@
 msgstr "Выберите хотя бы одну линию для упрощения."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1755,4 +1809,5 @@
 #: ../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 "Да"
@@ -1803,8 +1858,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Текущее выделение невозможно разделить."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3063,4 +3117,5 @@
 
 #. 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
@@ -3090,5 +3145,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3309,7 +3364,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Вы удаляете неполные объекты.<br>Это может привести к проблемам, потому что "
@@ -3344,10 +3400,5 @@
 msgstr[2] "Переместить {0} точек"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Очищеный объект ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3358,4 +3409,10 @@
 msgstr[2] "Очищено {0} объектов"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Очищеный объект ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3767,5 +3824,5 @@
 "Невозможно добавить примитив {0} к набору данных, так как он уже присутствует"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3778,6 +3835,6 @@
 "критическая ошибка, но необходимо сохраниться, прежде чем продолжить работу."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3787,10 +3844,12 @@
 msgstr "Отстутствует результат слияния для линии с id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Отстутствует результат слияния для объекта с id {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3798,5 +3857,5 @@
 msgstr "Отстутствует результат слияния для точки с id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3805,5 +3864,5 @@
 msgstr "Отстутствует результат слияния для отношения с id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3812,4 +3871,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Отсутствует результат слияния типа {0} с id {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4116,5 +4183,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "железная дорога"
@@ -4390,70 +4457,70 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "использование"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Показать эту справку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Стандартный параметр геометрии unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Скачать область в пределах рамки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Открыть файл (любой тип файлов, который можно открыть с помощью Файл/Открыть)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Скачать область в пределах рамки, как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Скачать расположение с URL (с lat=x&lon=y&zoom=z) как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Выбор с учетом поиска"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Запуск в развернутом виде"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Восстановить настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Указать язык"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "системные настройки Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Сменить папку для всех настроек пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4467,9 +4534,9 @@
 "максимальный размер выделенной памяти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "примеры"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4479,5 +4546,5 @@
 "порядке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
@@ -4485,41 +4552,41 @@
 "selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Инициализация"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Обновление модулей..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Установка обновлённых модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Загрузка ранних модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Создание интерфейса"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Загрузка модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr "Несохранённый данные osm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "Восстановить"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4528,5 +4595,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4535,9 +4602,28 @@
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+"<h2>Для работы JOSM требуется 6 версия Java.</h2>Обнаруженная версия Java: "
+"{0}.<br>Вам надо <ul><li>обновить Java (JRE) или</li><li>использовать более "
+"раннюю версию JOSM (совместимую с Java 5).</li></ul>Больше информации:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Файл"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4556,10 +4642,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Вид"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4567,5 +4653,5 @@
 msgstr "Инструменты"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4573,5 +4659,5 @@
 msgstr "Заготовки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4582,5 +4668,5 @@
 msgstr "Меню: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Аудио"
@@ -4680,17 +4766,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Числовое"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "китайская"
+msgstr "Китайский"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Деловая территория"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5450,5 +5533,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "все"
@@ -6117,5 +6200,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Отношения"
@@ -6209,10 +6292,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Выбрать в списке отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Выбрать отношение в списке отношений."
@@ -6828,4 +6911,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7287,5 +7372,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7329,111 +7413,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Название"
@@ -8571,21 +8656,25 @@
 msgstr "Переименовать выделенные закладки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "мин. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "мин. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "макс. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "макс. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8595,10 +8684,10 @@
 "область)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8607,15 +8696,15 @@
 msgstr "Строка ''{0}'' не является правильным двойным значением."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Значение широты должно быть в пределах [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Значение долготы должно быть в пределах  [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8767,8 +8856,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Тип"
@@ -8797,6 +8886,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "неизвестно"
@@ -9231,7 +9320,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "неверный комментарий загрузки на сервер"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9443,7 +9531,9 @@
 msgstr "Выберите имя файла"
 
+#. 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 "Нет"
@@ -9796,17 +9886,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "неверный комментарий загрузки на сервер"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "В обратном порядке"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Продолжить"
+msgstr "Продолжить как есть"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9824,16 +9911,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Отменить и вернуться в редактор"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
 msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Проигнорировать совет и загрузить"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Больше не показывать"
+msgstr "Больше не показывать это сообщение"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -10060,5 +10145,5 @@
 msgstr[2] "Загрузка на сервер {0} объектов..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10260,5 +10345,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Описание"
@@ -12050,5 +12135,5 @@
 msgstr "Цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12059,23 +12144,23 @@
 msgstr "Все"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Локальные файлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Нет"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Отображать линии, даже если нет импортированых сегментов."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Отображать GPS большими точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
@@ -12083,9 +12168,9 @@
 "окружностью."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорость (красный = медленно, зелёный = быстро)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -12093,5 +12178,5 @@
 "имеются)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним цветом (может быть определено для именованных слоёв)"
@@ -12099,5 +12184,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12119,5 +12204,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12159,5 +12244,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12171,16 +12256,16 @@
 msgstr "Пешком"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Отображать стрелки направления"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Быстрая отрисовка (выглядит хуже)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12189,49 +12274,54 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Только в начале пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Отображать порядковые номера сегментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Отображать границы скачанных данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Отображать виртуальные точки в режиме выбора"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Отображать неактивные слои другим цветом"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Сглаженные линии (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Создавать маркеры, читая GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Автор"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "дизельное"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr "Авто"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Лодка"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12240,9 +12330,9 @@
 "Автоматически создавать слой меток из путевых точек при открытии GPX слоя"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Рисовать линии между точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12252,9 +12342,9 @@
 "чтобы рисовать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальная длина для локальных файлов (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12263,20 +12353,20 @@
 "чтобы отображать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Максимальная длина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Отображать линии, даже если нет импортированой информации о линиях."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Отображать стрелки на линиях, соединяющих точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12285,5 +12375,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12291,13 +12381,13 @@
 msgstr "Не отображать стрелки, если они находятся близко от предыдущих стрелок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Минимальное расстояние (в пикселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Отображать точки GPS более жирно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12307,9 +12397,9 @@
 "Менеджере Слоев."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Цвета точек и сегментов треков по скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12319,55 +12409,54 @@
 "устройство захвата требует регистрации этой информации."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Позволяет настраивать окраску трека для различных средних скоростей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Раскрасить треки и точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Описание путевой точки"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Показывать направление на сегментах путей."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показывать порядковые номера на всех сегментах линии."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Применить сглаживание карты."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Отображать границы области, скачанной с сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Отображать неактивные слои данных другим цветом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Данные OSM"
@@ -12768,7 +12857,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Слой для проведения измерений"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13516,5 +13604,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
 msgid "Search in tags"
-msgstr ""
+msgstr "Поиск в тегах"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13709,5 +13797,5 @@
 msgstr "Разбор ответа сервера ..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -15457,5 +15545,5 @@
 "<br><br>Сообщение об ошибке:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15487,5 +15575,5 @@
 "проблема конфигурации. JOSM прекращает работу."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15753,5 +15841,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -16293,5 +16381,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Здания"
@@ -16546,5 +16634,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -18570,7 +18658,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "Разрешённая версия:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -19201,13 +19288,13 @@
 msgstr "Ряд домов вдоль улицы"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Свойство обувного магазина"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Разделитель"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20394,5 +20481,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Мультиполигон"
@@ -22467,5 +22554,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Обозначение"
@@ -23004,5 +23091,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "металл"
@@ -23015,5 +23102,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "древесина"
@@ -23291,4 +23378,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -23317,9 +23466,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "да"
@@ -23429,9 +23609,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "нет"
@@ -23855,5 +24066,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "туристический"
@@ -23888,5 +24099,5 @@
 msgstr "хорошее"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "средний"
@@ -23900,5 +24111,13 @@
 msgstr "ужасное"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Инвалидные коляски"
@@ -24027,4 +24246,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -24056,14 +24283,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Оператор"
@@ -24325,12 +24556,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Высота над уровнем моря"
@@ -25182,5 +25413,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Напряжение"
@@ -25492,6 +25723,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -25543,32 +25776,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Часы работы"
@@ -25577,4 +25810,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -25627,174 +25861,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr "С киоском"
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Виды топлива:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "дизельное"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "биодизель"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "дизельное синтетическое (GTL-технология)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "дизельное для тяжёлого транспорта"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "бензин АИ-91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "бензин АИ-95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "бензин АИ-98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "бензин АИ-100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% смесь этанола)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% смесь этанола)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "пропан-бутан (АГЗС)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "природный газ"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr "топливная смесь 1/25 (для мопедов)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "топливная смесь 1/50 (для мопедов)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr "С киоском"
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25824,7 +26059,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Справочный номер"
@@ -25840,5 +26075,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "подземная"
@@ -25851,6 +26086,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Денежный сбор"
@@ -26026,5 +26261,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Инвалидное кресло"
@@ -26061,6 +26296,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Навес"
@@ -26068,5 +26303,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Скамейка"
@@ -26185,5 +26420,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Бакен"
@@ -26243,11 +26478,241 @@
 msgstr "Свойства гостиницы"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Звёзды"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "пассажирский терминал"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Номер телефона"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Мотель"
@@ -26255,20 +26720,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Свойства мотеля"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Гостевой дом"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Свойства гостевого дома"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Съёмный домик (шале)"
@@ -26276,10 +26741,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Свойства съёмного домика (шале)"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Общежитие / хостел"
@@ -26287,30 +26752,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Свойства общежития (хостела)"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Альпинистский домик"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Свойства альпинистского домика"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Стоянка фургонов"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Свойства стоянки фургонов"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Кемпинг"
@@ -26318,10 +26783,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Свойства кемпинга"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Общественное питание"
@@ -26332,5 +26797,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -26338,11 +26803,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Свойства ресторана"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Кухня"
@@ -26350,78 +26815,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "бутерброды"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "шашлык"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "французская"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "сэндвичи"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "суши"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Ресторан быстрого питания"
@@ -26429,17 +26895,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Свофства ресторана быстрого питания"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "рыба и чипсы"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "курятина"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Кафе"
@@ -26447,9 +26925,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Свойства кафе"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Пивная"
@@ -26457,19 +26936,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Свойства пивной"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Пивной сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Свойства пивного сада"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Бар"
@@ -26477,9 +26957,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Свойства бара"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -26487,24 +26968,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Свойства ночного клуба"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Достопримечательность"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Свойства достопримечательности"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Музей"
@@ -26512,9 +26994,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Свойства музея"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -26523,9 +27005,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Свойства зоопарка"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Место с хорошим видом"
@@ -26533,24 +27015,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Свойства смотровой площадки"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Наблюдательная вышка"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Парк развлечений"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Свойства парка развлечений"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Произведения искусства"
@@ -26558,5 +27040,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Свойства произведений искусств"
@@ -26564,19 +27046,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Справочное бюро"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Тип карты"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "топографическая"
@@ -26614,5 +27096,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26620,28 +27102,28 @@
 msgstr "карта улиц"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "план-схема"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Показанная область"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "окрестность"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "город"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "регион"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Подробное описание"
@@ -26651,5 +27133,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Показаны маршруты:"
@@ -26657,5 +27139,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "пешие"
@@ -26663,6 +27145,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "велосипедные"
@@ -26670,5 +27152,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "для горного велосипеда"
@@ -26676,6 +27158,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "лыжные"
@@ -26683,5 +27165,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "конные"
@@ -26689,54 +27171,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "...другие возможные способы передвижения"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Информационный стенд"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Содержимое указателя"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "объявления"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "животный мир"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Указатель направлений"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "столб"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Информационная стойка"
@@ -26744,29 +27225,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Подробное описание"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Аудиогид"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Аудиогид через мобильный телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Номер телефона"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Другие справочные бюро"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Свойства навеса"
@@ -26774,25 +27255,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Очаг"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "свойства места для пикника"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Замок"
@@ -26801,19 +27282,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Свойства замка"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Развалины"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Свойства развалин"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Археологические раскопки"
@@ -26822,9 +27303,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Свойства археологических раскопок"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -26832,10 +27313,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Свойства поля битвы"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Палеонтологические раскопки"
@@ -26843,5 +27324,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Свойства палеонтологических раскопок"
@@ -26849,15 +27330,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Свойства монумента"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Памятник"
@@ -26865,55 +27346,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Свойства памятника"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Свойства придорожного креста"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Свойства придорожной святыни"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Пограничный камень"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Свойства пограничного камня"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Свойства аквапарка"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -26921,35 +27402,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Свойства игровой площадки"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Место для рыбалки"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Свойства места для рыбалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Спортивные сооружения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Свойства стадиона"
@@ -26963,6 +27444,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -27378,6 +27859,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27412,240 +27893,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "американский_футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "бочче"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "канадский_футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "гребля на каное / каяке"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "скалолазание"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "тренировочные сетки для крикета"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "конный спорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr "гаэльский_футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "моторный спорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "ракетбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr "лига_регби"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr "объединение_регби"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "плавание"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Свойства спортивного центра"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Спортивное поле"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Свойства спортивного поля"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Трек"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Свойства трека"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Свойства поля для гольфа"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Поле для минигольфа"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Свойства поля для минигольфа"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Многоборье"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Править Многоборье"
@@ -27687,23 +28168,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "вид"
@@ -27745,211 +28226,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "спортивное поле"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "трек"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Боулинг (10-кегельный)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Свойства боулинга"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Свойства атлетики"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Свойства стрельбы из лука"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Скалолазание"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Свойства скалолазания"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Гребля на каное / каяке"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Свойства гребли на каное / каяке"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Свойства велоспорта"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Свойства собачьих бегов"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Конный спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Править конный спорт"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Свойства гимнастики"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Мотоспорт"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Свойства моторных видов спорта"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Свойства фигурного катания"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Скейтбординг"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Свойства скейтбординга"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Плавание"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Свойства плавания"
@@ -27957,52 +28438,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Свойства лыжного спорта"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Тип лыжни"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "горные лыжи"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "беговые лыжи"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "снежный парк"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "начальный"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "сложный"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "очень сложный"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "фрирайд"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Стрельба"
@@ -28010,204 +28491,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Свойства стрельбы"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Футбол (европейский)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Свойства футбола"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Свойства австралийского футбола"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr "Американский футбол"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr "Свойства Американского футбола"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr "Канадский футбол"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr "Свойства Канадского футбола"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr "Гаэльский футбол"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr "Свойства Гаэльского футбола"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr "Лига регби"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr "Свойства лиги регби"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr "Объединение регби"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr "Свойства объединения регби"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Свойства бейсбола"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Свойства бейсбола"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Свойства гольфа"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Бочче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Свойства бочче"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Свойства боулз"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Свойства крикета"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Тренировочные сетки для крикета"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Свойства тренировочных сеток для крикет"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Свойства крокета"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Свойства хокея"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Свойства пелоты"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Свойства ракетбола"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Свойства настольного тенниса"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Свойства тенниса"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Рукотворное"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Здание"
@@ -28215,5 +28696,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -28221,10 +28702,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Свойства общественного здания"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -28232,10 +28713,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Свойства муниципалитета"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Посольство"
@@ -28243,10 +28724,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Свойства посольства"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Суд"
@@ -28255,10 +28736,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Свойства суда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Тюрьма"
@@ -28267,10 +28748,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Свойства тюрьмы"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Полиция / милиция"
@@ -28280,10 +28761,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "свойства полиции / милиции"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -28292,10 +28773,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Свойства пожарного депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -28303,5 +28784,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Свойства почтамта"
@@ -28309,15 +28790,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Свойства детского сада"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Школа"
@@ -28325,10 +28806,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Свойства школы"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Вуз"
@@ -28336,10 +28817,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Свойства вуза"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Профессиональное училище"
@@ -28347,5 +28828,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Свойства профессионального училища"
@@ -28353,5 +28834,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -28360,10 +28841,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Свойства кинотеатра"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Библиотека"
@@ -28372,9 +28853,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Свойства библиотеки"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -28382,10 +28863,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Свойства центра искусств"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Театр"
@@ -28394,10 +28875,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Свойства театра"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Культовое место"
@@ -28407,5 +28888,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Свойства культового места"
@@ -28414,6 +28895,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Религия"
@@ -28422,66 +28903,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "бахаи"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "буддизм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "христианство"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "индуизм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "джайнизм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "иудаизм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "ислам"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "спиритуализм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "даосизм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "унитарианство"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Конфессия"
@@ -28490,81 +28971,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "англиканская"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "баптисты"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "католики"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "евангелисты"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "свидетели иеговы"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "лютеране"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "методисты"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "мормоны"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "православные"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "пятидесятники"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "пресвитериане"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "протестанты"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "квакеры"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "шииты"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "сунниты"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Адреса"
@@ -28573,5 +29054,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Правка адресов"
@@ -28579,5 +29060,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Номер дома"
@@ -28585,25 +29066,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Улица"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Город"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Код страны"
@@ -28612,5 +29093,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
@@ -28618,61 +29099,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "алфавитный"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Цеха"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Свойства цехов"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Башня"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Свойства башни"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Назначение башни"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "связная"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "наблюдательная"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Высота (в метрах)"
@@ -28680,25 +29161,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Свойства водонапорной башни"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Свойства газгольдера"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -28706,10 +29187,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Свойства маяка"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -28717,10 +29198,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Свойства ветряной мельницы"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -28729,41 +29210,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Свойства трубопровода"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "теплотрасса"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "нефть"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "канализация"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "любого назначения"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Расположение"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "подводная"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "надземная"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -28773,10 +29254,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Свойства чистных сооружений"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Кран"
@@ -28784,5 +29265,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Свойства крана"
@@ -28790,10 +29271,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Свойства бакена"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Геодезический пункт"
@@ -28801,10 +29282,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Свойства геодезического пункта"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Камера наблюдения"
@@ -28812,23 +29293,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Свойства камеры наблюдения"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "внутренняя"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "внешняя"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "общедоступное"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -28838,35 +29319,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Свойства электростанции"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "ветряная"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "гидро"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "тепловая"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "атомная"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "угольная"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "солнечная"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -28875,10 +29356,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Свойства электроподстанции"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -28887,5 +29368,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Свойства трансформаторной будки"
@@ -28893,10 +29374,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Табличка на линии электропередач"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -28907,23 +29388,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Свойства опоры ЛЭП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "вышка"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "столб"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Номер вышки"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -28932,20 +29413,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Свойства линии электропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Тип линии"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr "высоковольтная"
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28953,55 +29434,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Количество токонесущих кабелей (без грозозащитных)"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Расщепление фаз (число раздельных проводов)"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "один провод"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "два провода"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "три провода"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "четыре провода"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Туалет"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "ограничено"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Телефон"
@@ -29010,5 +29491,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Свойства телефона"
@@ -29016,5 +29497,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Монеты"
@@ -29022,5 +29503,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Банкноты"
@@ -29028,5 +29509,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -29034,5 +29515,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Дебетные карты"
@@ -29040,15 +29521,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Пункт приёма утильсырья"
@@ -29057,5 +29538,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Свойства пункта приёма утильсырья"
@@ -29063,35 +29544,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Урна для мусора"
@@ -29099,5 +29580,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Свойства урны для мусора"
@@ -29106,31 +29587,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Спинка"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "камень"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Цвет"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "чёрный"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "коричневый"
@@ -29209,5 +29690,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -29217,31 +29698,31 @@
 msgstr "зелёный"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "красный"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "синий"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "серый"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "белый"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Количество мест"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Охотничья вышка"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Свойства охотничьей вышки"
@@ -29250,30 +29731,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "низкая"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "половинная"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "полная"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Скрытая"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Запирается"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Фонтан"
@@ -29282,10 +29763,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Свойства фонтана"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -29294,10 +29775,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Свойства питьевой воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Пожарный кран"
@@ -29306,5 +29787,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Свойства пожарного крана"
@@ -29312,5 +29793,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Детский дом"
@@ -29318,15 +29799,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Свойства детского дома"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Магазины, служба быта"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Автомагазин"
@@ -29334,10 +29815,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Свойства автомагазина"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Веломагазин"
@@ -29346,28 +29827,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Свойства веломагазина"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Свойства супермаркета"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Бытовая химия"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Свойства магазина бытовой химии"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Небольшой магазин"
@@ -29375,9 +29856,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Свойства магазина шаговой доступности"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Киоск"
@@ -29385,27 +29866,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Свойства киоска"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Книжный магазин"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Свойства книжного магазина"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Туристическое агенство"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Свойства туристического агентства"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Мясная лавка"
@@ -29413,9 +29894,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Свойства мясной лавки"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Булочная"
@@ -29423,9 +29904,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Свойства булочной"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Цветочный магазин"
@@ -29433,18 +29914,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Свойства цветочного магазина"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Натуральные продукты"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Свойства магазина натуральных продуктов"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Алкогольная продукция"
@@ -29452,54 +29933,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Свойства магазина алкогольной продукции"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Свойства магазина напитков"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Компьютеры"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Свойства компьютерного магазина"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Бытовая электроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Свойства магазина бытовой электроники"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Звуковая аппаратура"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Свойства магазина звуковой аппаратуры"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Мебель"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Свойства мебельного магазина"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Садово-огородный магазин"
@@ -29507,9 +29988,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Свойства садово-огородного магазина"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Хозяйственный магазин"
@@ -29517,9 +29998,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Свойства хозяйственного магазина"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Сделай сам\""
@@ -29527,54 +30008,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Свойства магазина \"Сделай сам\""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Канцтовары"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Свойства магазина канцтоваров"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Свойства парикмахерской"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Свойство обувного магазина"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Свойства магазина игрушек"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Свойства магазина видео"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -29582,9 +30063,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Свойства химчистки"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Прачечная"
@@ -29592,9 +30073,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Свойства прачечной"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -29602,24 +30083,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Свойства магазина товаров для активного отдыха"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Свойства спортивного магазина"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Свойства магазина оптики"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -29627,5 +30108,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Свойства торгового автомата"
@@ -29633,97 +30114,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "схемы общественного транспорта"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "талоны на парковку"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "продукты питания"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "телефонные карты"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "ваучеры"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr "велосипедная шина"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "накопительные, дисконтные карты"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Финансы"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Банк"
@@ -29731,14 +30212,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Свойства банка"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -29746,5 +30227,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Свойства пункта обмена валют"
@@ -29752,15 +30233,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Свойства банкомата"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Здравоохранение"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Врач"
@@ -29768,18 +30249,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Свойства врача"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Стоматология"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Свойства стоматологии"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -29787,5 +30268,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Свойства аптеки"
@@ -29793,9 +30274,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Больница"
@@ -29803,10 +30284,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Свойства больницы"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Пункт экстренного вызова"
@@ -29815,5 +30296,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Свойства пункта скорой помощи"
@@ -29822,20 +30303,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Название точки"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Номер телефона"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, например: +7-916-0857403)"
@@ -29843,5 +30319,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Ветеринария"
@@ -29850,64 +30326,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Свойства ветеринарии"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Свойства континента"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Страна"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Свойства страны"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Штат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Свойства штата"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Область"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Свойства области"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Округ"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Свойства округа"
@@ -29915,15 +30391,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Свойства большого города"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -29931,10 +30407,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Свойствао малого города / посёлка"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Пригород"
@@ -29942,25 +30418,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Свойства пригорода"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Свойства села"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Свойства деревни"
@@ -29968,5 +30444,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Местность"
@@ -29974,10 +30450,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Свойства местности"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Остров"
@@ -29985,10 +30461,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Свойства острова"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Островок"
@@ -29996,5 +30472,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Свойства островка"
@@ -30002,5 +30478,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -30008,10 +30484,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Свойства входа в пещеру"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Вершина"
@@ -30019,10 +30495,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Свойства вершины"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Ледник"
@@ -30030,10 +30506,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Свойства ледника"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Вулкан"
@@ -30041,70 +30517,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Свойства вулкана"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Государственная"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Свойства государственной границы"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Административная"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Свойства административной границы"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Свойства политико-административной границы"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Политическая"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Свойства политической границы"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Национальный парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Свойства национального парка"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Дерево"
@@ -30113,15 +30589,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Свойства дерева"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Лес"
@@ -30130,5 +30606,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Свойства леса"
@@ -30136,17 +30612,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Лесопосадки"
@@ -30155,14 +30631,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Свойства лесопосадок"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Свойства заповедника"
@@ -30170,25 +30646,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Свойства каменистой осыпи"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Заросли кустарника"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Свойства зарослей кустарника"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Каменистая пустошь"
@@ -30196,10 +30672,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Свойства каменистой пустоши"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Пустырь"
@@ -30207,5 +30683,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Свойства пустыря"
@@ -30213,5 +30689,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -30220,45 +30696,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Свойства двора фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Сельскохозяйственные угодья"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Свойства сельскохозяйственных угодий"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Сенокосный луг"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Свойства сенокосного луга"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Виноградники"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Свойства виноградников"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Огородные участки"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Свойства огородных участков"
@@ -30266,25 +30742,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Сады"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Свойства садов"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Свойства газона"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Площадка для праздников"
@@ -30292,10 +30768,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Свойства площадки для праздников"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Общественные земли"
@@ -30303,20 +30779,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Свойства общественных земель"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Свойства парка"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Игровая площадка"
@@ -30324,5 +30800,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Свойства игровой площадки"
@@ -30330,15 +30806,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Свойства жилой зоны"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Погост"
@@ -30346,9 +30822,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Свойства погоста"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -30356,39 +30832,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Свойства кладбища"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Свойства зоны розничной торговли"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Деловая территория"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Свойства деловой территории"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Промышленная территория"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Свойства промышленной территории"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Территория железной дороги"
@@ -30396,15 +30872,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Свойства территории железной дороги"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Военная зона"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Свойства военной зоны"
@@ -30412,50 +30888,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Строительная площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Свойства стройплощадки"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Расчистка застройки"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Свойства расчистки застройки"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Зона под застройку"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Свойства зоны под застройку"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Свойства свалки"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Свойства карьера"
@@ -30465,5 +30941,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Править мультиполигон"
@@ -30475,5 +30951,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "внешний сегмент"
@@ -30481,5 +30957,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -30487,5 +30963,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Граница"
@@ -30496,5 +30972,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Свойства границы"
@@ -30502,36 +30978,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Тип границы"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "административная"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "национальная"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "общины"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "политическая"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Административный уровень"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "Подчиненная территория"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Административный центр"
@@ -30539,5 +31015,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -30546,5 +31022,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Свойства ограничения на поворот"
@@ -30552,34 +31028,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "только направо"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "только налево"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "только прямо"
@@ -30588,15 +31064,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "с линии"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "на линию"
@@ -30604,5 +31080,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Маршрут"
@@ -30611,5 +31087,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Свойства маршрута"
@@ -30617,5 +31093,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Тип маршрута"
@@ -30723,5 +31199,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30732,17 +31208,17 @@
 msgstr "велосипедный"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "лыжный"
@@ -30810,5 +31286,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30818,9 +31294,9 @@
 msgstr "пеший"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "объездной"
@@ -30834,10 +31310,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "линия метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Описание знака"
@@ -30845,31 +31321,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Состояние маршрута"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -30878,30 +31354,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "конечная назад"
@@ -32079,16 +32555,4 @@
 msgstr "воздушная трасса"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "пассажирский терминал"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -35008,21 +35472,4 @@
 msgstr "Sicily - Италия"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Выделенная линия не содержит все выделенные точки"
-#~ msgstr[1] "Выбранная линия не содержит выбранных точек"
-#~ msgstr[2] "Выделенная линия не содержит все выбранные точки"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Градусы, минуты, секунды"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Пожалуйста, введите комментарий для этой загрузки на сервер пакета правок "
-#~ "(мин. 3 символа)"
-
 #~ msgid "No data imported."
 #~ msgstr "Данные не импортированы"
@@ -35522,4 +35969,7 @@
 #~ msgstr "Ошибка при разборе."
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Градусы, минуты, секунды"
+
 #~ msgid "No document open so nothing to save."
 #~ msgstr "Нет открытых документов. Нечего сохранять."
@@ -35822,7 +36272,4 @@
 #~ msgid "<multiple>"
 #~ msgstr "<множественный>"
-
-#~ msgid "Continue anyway"
-#~ msgstr "Продолжить в любом случае"
 
 #~ msgid "Replaces Selection with Users data"
@@ -36157,7 +36604,4 @@
 #~ "найдены."
 
-#~ msgid "Confirmation"
-#~ msgstr "Подтверждение"
-
 #~ msgid "Delete all"
 #~ msgstr "Удалить всё"
@@ -36764,4 +37208,10 @@
 #~ msgstr "Обновить выделенные элементы с сервера"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Выделенная линия не содержит все выделенные точки"
+#~ msgstr[1] "Выбранная линия не содержит выбранных точек"
+#~ msgstr[2] "Выделенная линия не содержит все выбранные точки"
+
 #~ msgid "Found {0} matches of {1} in GPX track {2}"
 #~ msgstr "Надено {0} совпадений из {1} в GPX треке {2}"
@@ -36799,4 +37249,9 @@
 #~ msgid "latitude"
 #~ msgstr "широта"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Пожалуйста, введите комментарий для этой загрузки на сервер пакета правок "
+#~ "(мин. 3 символа)"
 
 #~ msgid ""
@@ -36811,4 +37266,7 @@
 #~ msgid "Current changeset is null. Can't upload data."
 #~ msgstr "Текущий пакет правок пуст. Невозможно загрузить данные."
+
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Введите комментарий для загрузки на сервер (мин. 3 символа)"
 
 #~ msgid ""
@@ -36979,4 +37437,7 @@
 #~ msgid "unexpected null value for n.getEastNorth(). id of n is"
 #~ msgstr "неожиданное значение null для n.getEastNorth(). id из n"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Отстутствует результат слияния для объекта с id {0}"
 
 #~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 22626)
+++ applications/editors/josm/i18n/po/sk.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-06-23 22:48+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-04 17:18+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-08-04 17:00+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -229,4 +229,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -238,4 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -245,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -300,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Zrušiť"
@@ -366,4 +368,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -422,5 +425,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1390,5 +1393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1457,4 +1460,53 @@
 msgid "Preferences"
 msgstr "Nastavenia"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Merač..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Potvrdenie"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "pridať k výberu"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1496,4 +1548,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1733,4 +1786,5 @@
 msgstr "Vyberte aspoň jednu cestu k zjednodušeniu."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1738,4 +1792,5 @@
 #: ../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 "Áno"
@@ -1786,8 +1841,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Tento výber nemôže byť použitý k rozdeleniu."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3025,4 +3079,5 @@
 
 #. 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
@@ -3052,5 +3107,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3271,7 +3326,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Chystáte sa zmazať neúplné objekty.<br> To spôsobí problémy, pretože "
@@ -3306,10 +3362,5 @@
 msgstr[2] "Posun {0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Očistený objekt ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3320,4 +3371,10 @@
 msgstr[2] "Očistených {0} objektov"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Očistený objekt ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3728,5 +3785,5 @@
 msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3739,6 +3796,6 @@
 "kritická chyba, mali by ste bezpečne pokračovať vo vašej práci."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3748,10 +3805,12 @@
 msgstr "Chýbajúci cieľ pre spojenie s cestou s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Chýba zlúčujúci ciel pre objekt s id {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3759,5 +3818,5 @@
 msgstr "Chýba zlúčujúci ciel pre bod s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3766,5 +3825,5 @@
 msgstr "Chýba zlúčujúci ciel pre reláciu s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3773,4 +3832,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Chýba zlúčujúci ciel typu {0} s id {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4077,5 +4144,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "železnica"
@@ -4353,70 +4420,70 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "použitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Zobrazí túto nápovedu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Štandardný unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Stiahnuť ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Otvoriť súbor (niektoré typy súborov môžu byť otvorené s Súbor/Otvoriť)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Sťahovanie polohy na url (so lat=x&lon=y&zoom=z) ako raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Výber s určeným hľadaním"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Spustiť v maximalizovanom režime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Nastaviť východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Nastaviť jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "možnosti poskytnutia ako Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/JOSM/ZLOŽKE/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Zmena adresára  pre všetký nastavenia užívateľa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4430,9 +4497,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "príklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4442,45 +4509,45 @@
 "poriadku."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "Uistite sa, že ste načítali nejaké dáta ak ste použili --výber."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Prebieha inicializácia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Aktualizujem pluginy..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Inštalujem aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Načítavam skoršie pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Nastavujem východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Vytváram hlavné grafické rozhranie ( GUI )"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Načítavam pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4489,14 +4556,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Súbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4515,10 +4598,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Zobraziť"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4526,5 +4609,5 @@
 msgstr "Nástroje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4532,5 +4615,5 @@
 msgstr "Predvoľby"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4541,5 +4624,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Zvuk"
@@ -4639,17 +4722,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Číselný"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "čínska"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Obchodná (komerčná)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5404,5 +5484,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "všetky"
@@ -6074,5 +6154,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relácie"
@@ -6166,10 +6246,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Vybrať v obsahu relácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Vybrať reláciu v obsahu relácií."
@@ -6369,5 +6449,5 @@
 msgctxt "changeset.state"
 msgid "Open"
-msgstr "Otvorené"
+msgstr "Otvoriť"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
@@ -6391,5 +6471,5 @@
 #: build/specialmessages.java:59
 msgid "Open"
-msgstr "Otvorené"
+msgstr "Otvoriť"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
@@ -6788,4 +6868,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7247,5 +7329,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7289,111 +7370,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Názov"
@@ -8511,21 +8593,25 @@
 msgstr "Premenovať vybratú záložku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min šírka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max šírka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8535,10 +8621,10 @@
 "oblasti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8547,15 +8633,15 @@
 msgstr "Reťazec ''{0}'' nie je platný, zdvojená hodnota."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Hodnota pre zemepisnú šírku v rozsahu [-90,90] povinná."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Hodnota pre zemepisnú dížku v rozsahu [-180,180] povinná."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8706,8 +8792,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Typ"
@@ -8736,6 +8822,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "neznámy"
@@ -9163,7 +9249,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Neplatná poznámka nahrávania"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9369,7 +9454,9 @@
 msgstr "Vybrať meno súboru"
 
+#. 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 "Nie"
@@ -9711,17 +9798,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Neplatná poznámka nahrávania"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Obrátene"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Pokračovanie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9739,7 +9823,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Zrušiť a návrat do editora"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9748,7 +9831,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Nezobrazovať v budúcnosti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9969,5 +10051,5 @@
 msgstr[2] "Nahrávanie {0} objektov ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10167,5 +10249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Popis"
@@ -11947,5 +12029,5 @@
 msgstr "Farby"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11956,35 +12038,35 @@
 msgstr "Všetko"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Miestne súbory"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Žiadny"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Zosilniť líniu, ak žiadne segmenty nie su naimportované."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Kresliť väčšie GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "Kresliť kruh z HDOP hodnoty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rýchlosť (červená = pomaly, zelená = rýchlo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupná)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)"
@@ -11992,5 +12074,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12012,5 +12094,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12052,5 +12134,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12064,65 +12146,70 @@
 msgstr "Pešo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Kresliť šípky v smere jazdy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Rýchle vykresľovanie (vypadá nepekne)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Iba dôležité smery (napr. jednosmerka)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Iba na začiatku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Vykresliť segmenty s poradovými číslami"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykresliť ohraničujúci box stiahnutých dát"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykresľovať virtuálne body v mode výberu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Vykresľovať neaktívne vrstvy v iných farbách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhladené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Vytvorenie markerov pri čítaní GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Nafta"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Loď"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12131,9 +12218,9 @@
 "Automatické vytvorenie vrstvy značiek z bodov cesty pri otvorení GPX vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Kresliť čiary medzi raw GPS bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12143,9 +12230,9 @@
 "1'' pre kresbu všetkých čiar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Maximálna dĺžka pre lokálne súbory (v metroch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12154,10 +12241,10 @@
 "kreslenie všetkých línií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maximálna dĺžka (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -12166,10 +12253,10 @@
 "čiarach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Kresliť smerové šípky pre línie, ktoré spájajú GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12178,5 +12265,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12184,13 +12271,13 @@
 msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minimálna vzdialenosť (pixelov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovať väčšie bodky pre GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12200,9 +12287,9 @@
 "v  manažéri vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Farby bodov traťových segmentov podľa rýchlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12212,5 +12299,5 @@
 "pre digitalizáciu musia zaznamenať informácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -12218,32 +12305,31 @@
 "rýchlostí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Farebná trať a body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Popis bodov"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Kresliť smer cestného segmentu"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Kresliť poradové čísla všetkých segmentov v rámci cesty."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -12251,19 +12337,19 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovať hranice dát stiahnutých zo servera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovať neaktívne vrstvy dát inou farbou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM údaje"
@@ -12660,7 +12746,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Vrstva pre vykonávanie meraní"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13573,5 +13658,5 @@
 msgstr "Spracovávam odpoveď  servera ..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -15318,5 +15403,5 @@
 "<br><br>Chybová správa je:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15348,5 +15433,5 @@
 "problém. JOSM prestane pracovať."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15610,5 +15695,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -16058,5 +16143,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Budovy, stavby"
@@ -16310,5 +16395,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -18326,7 +18411,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "finálna verzia:"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18952,13 +19036,13 @@
 msgstr "Rad (Terrace)"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Upravit obchod s obuvou"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Oddeľovač"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20128,5 +20212,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -22171,5 +22255,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Ref. číslo"
@@ -22708,5 +22792,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "kov"
@@ -22719,5 +22803,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "drevo (wood)"
@@ -22995,4 +23079,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -23021,9 +23167,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "áno"
@@ -23133,9 +23310,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "nie"
@@ -23559,5 +23767,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "turistika"
@@ -23592,5 +23800,5 @@
 msgstr "dobré"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
@@ -23604,5 +23812,13 @@
 msgstr "hrozné"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Vozíky"
@@ -23731,4 +23947,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23760,14 +23984,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operátor"
@@ -24030,12 +24258,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -24893,5 +25121,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Napätie"
@@ -25204,6 +25432,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -25255,32 +25485,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Otváracia doba"
@@ -25289,4 +25519,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -25339,174 +25570,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pi 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Typy palív"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Nafta"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Bio nafta"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Nafta pre ťažké nákladné automobily"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "Oktán 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "Oktán 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "Oktán 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "Oktán 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Skvapalnený ropný plyn)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Stlačený zemný plyn)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 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:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25536,7 +25768,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Referenčné číslo"
@@ -25552,5 +25784,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "podzemie"
@@ -25563,6 +25795,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Poplatok"
@@ -25738,5 +25970,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -25773,6 +26005,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Prístrešok"
@@ -25780,5 +26012,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Lavička"
@@ -25897,5 +26129,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -25955,11 +26187,241 @@
 msgstr "Upraviť hotel"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Hviezdičkový"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminál"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefónne číslo"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -25967,20 +26429,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Upraviť motel"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Chata"
@@ -25988,10 +26450,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Upraviť chatu"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -25999,30 +26461,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Upraviť ubytovňu"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -26030,10 +26492,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Upraviť stanový tábor"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -26044,5 +26506,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Reštaurácia"
@@ -26050,11 +26512,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Upraviť reštauráciu"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -26062,78 +26524,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "sendvič"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -26141,17 +26604,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "kura"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -26159,9 +26634,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Krčma"
@@ -26169,19 +26645,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -26189,9 +26666,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -26199,24 +26677,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Múzeum"
@@ -26224,9 +26703,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Upraviť múzeum"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -26235,9 +26714,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Upraviť zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -26245,24 +26724,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Zábavný park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Umelecké dielo"
@@ -26270,5 +26749,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Upraviť umelecké dielo"
@@ -26276,19 +26755,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Informačná kancelária"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Úroveň detailu"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "topografická"
@@ -26326,5 +26805,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26332,28 +26811,28 @@
 msgstr "pouličná sieť"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "prehľadová (oreintačná)"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Zobrazená oblasť"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "miesto (blízke okolie)"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "mesto (city)"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "oblasť (region)"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -26363,5 +26842,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Zobrazené cesty sú pre:"
@@ -26369,5 +26848,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Turistika"
@@ -26375,6 +26854,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -26382,5 +26861,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "Horský bicykel"
@@ -26388,6 +26867,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Lyžovanie"
@@ -26395,5 +26874,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "Jazdectvo"
@@ -26401,54 +26880,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "... iný druh prepravy"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Informačný panel s radami (board content)"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "upozornenie"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "divoká príroda"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "závod"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Rázcestník (ukazovateľ smeru)"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "stožiar(pole)"
+msgstr ""
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Informačný terminál"
@@ -26456,29 +26934,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Audiosprievodcovia"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Audiosprievodcovia cez mobilný telefón?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Číslo telefónu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Ostatné (iné) informačné body (miesta)"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -26486,25 +26964,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Hrad"
@@ -26513,19 +26991,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Zrúcanina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Upraviť zrúcaninu"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -26534,9 +27012,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -26544,10 +27022,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Upraviť bojisko"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Palaeontological Areál"
@@ -26555,5 +27033,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Upraviť Palaeontological Areál"
@@ -26561,15 +27039,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Pomník"
@@ -26577,55 +27055,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Hraničné kamene"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Upraviť hraničné kamene"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Voľný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Ihrisko"
@@ -26633,35 +27111,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Športy"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -26675,6 +27153,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -27090,6 +27568,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27124,78 +27602,78 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
@@ -27203,165 +27681,165 @@
 "trávnika)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -27403,23 +27881,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "typ"
@@ -27461,211 +27939,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "stopa"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
@@ -27673,52 +28151,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Streľba"
@@ -27726,204 +28204,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Človekom-Vytvorené (Man-Made)"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Budova"
@@ -27931,5 +28409,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -27937,10 +28415,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -27948,10 +28426,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -27959,10 +28437,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Súd"
@@ -27971,10 +28449,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Vezenie"
@@ -27983,10 +28461,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Polícia"
@@ -27996,10 +28474,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -28008,10 +28486,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Pošta"
@@ -28019,5 +28497,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -28025,15 +28503,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Škola"
@@ -28041,10 +28519,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Univerzita"
@@ -28052,10 +28530,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Vysoká škola"
@@ -28063,5 +28541,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -28069,5 +28547,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Kino"
@@ -28076,10 +28554,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Knižnica"
@@ -28088,9 +28566,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -28098,10 +28576,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Divadlo"
@@ -28110,10 +28588,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -28123,5 +28601,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -28130,6 +28608,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -28138,66 +28616,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -28206,81 +28684,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adresy"
@@ -28289,5 +28767,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -28295,5 +28773,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Číslo domu"
@@ -28301,25 +28779,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Názov ulice"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -28328,5 +28806,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -28334,61 +28812,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Veža"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Typ veže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "telekomunikačná"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "pozorovateľňa"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Výška (metre)"
@@ -28396,25 +28874,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Maják"
@@ -28422,10 +28900,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -28433,10 +28911,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -28445,41 +28923,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "teplo(heat)"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "ropa(oil)"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "splašky(sewage)"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "nejaké látky(any substance)"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "podvodné(underwater)"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "nadzemné(overground)"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -28489,10 +28967,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Žeriav"
@@ -28500,5 +28978,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
@@ -28506,10 +28984,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -28517,10 +28995,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -28528,23 +29006,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "vnútorný"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "vonkajší"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "verejný"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -28554,35 +29032,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -28591,10 +29069,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -28603,5 +29081,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -28609,10 +29087,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -28623,23 +29101,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "veža"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "stožiar(pole)"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Nastavenie veže"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -28648,20 +29126,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Typ vedenia"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28669,55 +29147,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Počet káblov"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Počet vodičov (lepší: vodič) pre napájacie káble"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "jedno"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "dvojité"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "trojité"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "štvorité"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toalety"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "omedzený"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefón"
@@ -28726,5 +29204,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -28732,5 +29210,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Mince"
@@ -28738,5 +29216,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Bankovky"
@@ -28744,5 +29222,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -28750,5 +29228,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -28756,15 +29234,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -28773,5 +29251,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -28779,35 +29257,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Odpadkový kôš"
@@ -28815,5 +29293,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Upraviť odpadkový kôš"
@@ -28822,31 +29300,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Oreradlo chrbta (Backrest)"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "kameň"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Farba"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "čierna"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "hnedá"
@@ -28925,5 +29403,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28933,31 +29411,31 @@
 msgstr "zelená"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "biela"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Počet sedadiel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
@@ -28966,30 +29444,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Skryť"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fontána"
@@ -28998,10 +29476,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -29010,10 +29488,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -29022,5 +29500,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Upraviť hydrant"
@@ -29028,5 +29506,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -29034,15 +29512,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Obchod s autami"
@@ -29050,10 +29528,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Upraviť obchod s autami"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Bicyklový obchod"
@@ -29062,28 +29540,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Upraviť bicyklový obchod"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Lekáreň"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Upraviť lekáreň"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -29091,9 +29569,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Stánok"
@@ -29101,27 +29579,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Kníhkupectvo"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Upraviť kníhkupectvo"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Cestovná kancelária"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Upraviť cestovnú kanceláciu"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -29129,9 +29607,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Upraviť mäsiarstvo"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -29139,9 +29617,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Upraviť chlieb a pečivo"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -29149,18 +29627,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Upraviť kvetinárstvo"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -29168,54 +29646,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Upraviť Obchod s alkoholickými nápojmi"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Upraviť Obchod s nápojmi."
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Počítač"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -29223,9 +29701,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Upraviť záhradné centrum"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -29233,9 +29711,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Upraviť železiarstvo"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -29243,54 +29721,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Upraviť obchod Urob si sám"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -29298,9 +29776,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Upraviť chemickú čistiareň"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -29308,9 +29786,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Upraviť práčovňu"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -29318,24 +29796,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Upraviť očnú optiku"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -29343,5 +29821,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -29349,97 +29827,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banka"
@@ -29447,14 +29925,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Upraviť banku"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -29462,5 +29940,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -29468,15 +29946,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Lekári"
@@ -29484,18 +29962,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -29503,5 +29981,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -29509,9 +29987,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -29519,10 +29997,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -29531,5 +30009,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -29538,20 +30016,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefónne číslo"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -29559,5 +30032,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -29566,64 +30039,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografia(Zemepis)"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Miesta"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Stav"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -29631,15 +30104,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Mesto (town)"
@@ -29647,10 +30120,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Štvrť"
@@ -29658,25 +30131,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Dedina"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -29684,5 +30157,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -29690,10 +30163,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Ostrov"
@@ -29701,10 +30174,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Ostrovček"
@@ -29712,5 +30185,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Upraviť ostrovček"
@@ -29718,5 +30191,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -29724,10 +30197,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Vrchol"
@@ -29735,10 +30208,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -29746,10 +30219,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Sopka"
@@ -29757,70 +30230,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Štátna"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Občianske"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Politická"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Národný park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Strom"
@@ -29829,15 +30302,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Drevo"
@@ -29846,5 +30319,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -29852,17 +30325,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Les"
@@ -29871,14 +30344,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -29886,25 +30359,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Sutina"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -29912,5 +30385,5 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
@@ -29918,5 +30391,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Vresovisko"
@@ -29924,5 +30397,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
@@ -29930,5 +30403,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Farma"
@@ -29937,45 +30410,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -29983,25 +30456,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -30009,10 +30482,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -30020,20 +30493,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -30041,5 +30514,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -30047,15 +30520,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -30063,9 +30536,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -30073,39 +30546,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -30113,15 +30586,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Armáda"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -30129,50 +30602,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
@@ -30182,5 +30655,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -30192,5 +30665,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
@@ -30198,5 +30671,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -30204,5 +30677,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -30213,5 +30686,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -30219,36 +30692,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -30256,5 +30729,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -30263,5 +30736,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -30269,34 +30742,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -30305,15 +30778,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "k ceste"
@@ -30321,5 +30794,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -30328,5 +30801,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -30334,5 +30807,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -30440,5 +30913,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30449,17 +30922,17 @@
 msgstr "bicykel"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "lyžovanie"
@@ -30527,5 +31000,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30535,9 +31008,9 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "obchádzka"
@@ -30551,10 +31024,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -30562,31 +31035,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Štátna cesta"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -30595,30 +31068,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -31796,16 +32269,4 @@
 msgstr "letecké cesty"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminál"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34724,20 +35185,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Označená cesta neobsahuje vybratý bod."
-#~ msgstr[1] "Označená cesta neobsahuje všetky vybraté body."
-#~ msgstr[2] "Označená cesta neobsahuje všetky vybraté body."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Stupne minúty sekundy"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
-
 #~ msgid "Move"
 #~ msgstr "Presunúť"
@@ -35271,4 +35716,7 @@
 #~ msgstr "rôzne"
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Stupne minúty sekundy"
+
 #~ msgid ""
 #~ "You are about to delete nodes outside of the area you have downloaded."
@@ -35285,4 +35733,10 @@
 #~ msgid "Split way segment"
 #~ msgstr "Rozdeliť segment cesty"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Označená cesta neobsahuje vybratý bod."
+#~ msgstr[1] "Označená cesta neobsahuje všetky vybraté body."
+#~ msgstr[2] "Označená cesta neobsahuje všetky vybraté body."
 
 #~ msgid "Synchronize Time with GPS Unit"
@@ -35602,7 +36056,4 @@
 #~ msgstr "Priesečník nie je najdený. Nič nebolo zmenené."
 
-#~ msgid "Continue anyway"
-#~ msgstr "Pokračovať akokoľvek"
-
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr "TOTO JE EXPERIMENTÁLNE. Uložte vašu prácu a overte pred nahrávaním."
@@ -36250,7 +36701,4 @@
 #~ "Výnimky boli: {0}"
 
-#~ msgid "Confirmation"
-#~ msgstr "Potvrdenie"
-
 #~ msgid "Deleting layer {0} of {1}"
 #~ msgstr "Vymazávaná vrstva {0} z {1}"
@@ -36436,4 +36884,8 @@
 #~ msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty"
 
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
+
 #~ msgid ""
 #~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -36669,4 +37121,7 @@
 #~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu."
 
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)"
+
 #~ msgid "Uploading {0} objects ..."
 #~ msgstr "Nahrávam {0} objekty(ov) ..."
@@ -36714,4 +37169,7 @@
 #~ "Prázdna množina objektov, na zmazanie je potrebné vybrať aspoň jeden "
 #~ "objekt"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Chýba zlúčujúci ciel pre objekt s id {0}"
 
 #~ msgid "null detected in node list"
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 22626)
+++ applications/editors/josm/i18n/po/sl.po	(revision 22628)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
 "PO-Revision-Date: 2010-06-28 15:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -26,6 +26,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -223,4 +223,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -232,4 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -239,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -294,5 +296,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Prekliči"
@@ -358,4 +360,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -414,5 +417,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1354,5 +1357,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1417,4 +1420,52 @@
 msgid "Preferences"
 msgstr "Nastavitve"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Purge..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "uporaba"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Nastavi vire vstavkov"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "dodaj v izbor"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1456,4 +1507,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1688,4 +1740,5 @@
 msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1693,4 +1746,5 @@
 #: ../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 ""
@@ -2891,4 +2945,5 @@
 
 #. 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
@@ -2918,5 +2973,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "V redu"
@@ -3126,5 +3181,5 @@
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 
@@ -3156,10 +3211,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3169,4 +3219,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3545,5 +3601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3553,6 +3609,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3562,10 +3618,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3573,5 +3631,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3580,5 +3638,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3586,4 +3644,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3886,5 +3952,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "železnica"
@@ -4156,69 +4222,69 @@
 msgstr "Geslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "uporaba"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Prikaži to pomoč"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Sprejmi pravokotno področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Sprejmi pravokotno področje GPS podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Ponastavi nastavitve na privzete"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4228,9 +4294,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "primeri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4238,45 +4304,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Pripravljanje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Nalaganje zgodnjih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Privzete nastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Priprava grafičnega uporabniškega vmesnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Nalaganje vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4285,14 +4351,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Datoteka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4311,10 +4393,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Pogled"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4322,5 +4404,5 @@
 msgstr "Orodja"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4328,5 +4410,5 @@
 msgstr "Prednastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4337,5 +4419,5 @@
 msgstr "Meni: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Zvok"
@@ -4437,7 +4519,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "Kovanci"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
@@ -5149,5 +5230,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr ""
@@ -5783,5 +5864,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relacije"
@@ -5875,10 +5956,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6477,4 +6558,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6936,5 +7019,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6978,111 +7060,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Naziv"
@@ -8118,21 +8201,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8141,10 +8228,10 @@
 "Povezava na www.openstreetmap.org (za sprejem področja sem prilepite URL)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Pravokotno področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8153,15 +8240,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8307,8 +8394,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Vrsta"
@@ -8337,6 +8424,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "neznan"
@@ -8909,7 +8996,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9218,12 +9307,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Različica"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Gorski prelaz"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9249,7 +9336,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Ne prikaži več"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9432,5 +9518,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9611,5 +9697,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Opis"
@@ -11232,5 +11318,5 @@
 msgstr "Barve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11241,35 +11327,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Riši velike točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hitrost (rdeče = počasi, zeleno = hitro)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enobarvno (barvo poimenovanih plasti je mogoče prilagoditi po meri)"
@@ -11277,5 +11363,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11297,5 +11383,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11337,5 +11423,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11349,63 +11435,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Riši smerne puščice"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Le zanimive smerne puščice (npr enosmerne ceste)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Le na koncu poti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Riši meje sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Riši nedejavne plasti v drugi barvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Avtor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11413,9 +11506,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11423,9 +11516,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11434,25 +11527,25 @@
 "Nastavite ''-1'' za povezavo vseh točk."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Največja dolžina (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11460,13 +11553,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Najmanjša razdalja (slikovnih točk)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11474,9 +11567,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Barvaj točke in segmente sledi glede na hitrost."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11484,54 +11577,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Riši nedejavne podatkovne plasti v drugi barvi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Podatki OSM"
@@ -12740,5 +12833,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14307,5 +14400,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14332,5 +14425,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14567,5 +14660,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -15014,5 +15107,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Zgradbe"
@@ -15249,5 +15342,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17813,13 +17906,13 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Uredi potok"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Ločilo"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18896,5 +18989,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr ""
@@ -20845,5 +20938,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr ""
@@ -21382,5 +21475,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21393,5 +21486,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr ""
@@ -21669,4 +21762,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21695,9 +21850,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "da"
@@ -21807,9 +21993,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr ""
@@ -22233,5 +22450,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22266,5 +22483,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22278,5 +22495,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22405,4 +22630,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22434,14 +22667,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr ""
@@ -22703,12 +22940,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr ""
@@ -23560,5 +23797,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr ""
@@ -23870,6 +24107,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -23921,32 +24160,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr ""
@@ -23955,4 +24194,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24005,174 +24245,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24202,7 +24442,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr ""
@@ -24218,5 +24458,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr ""
@@ -24229,6 +24469,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr ""
@@ -24404,5 +24644,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr ""
@@ -24439,6 +24679,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr ""
@@ -24446,5 +24686,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Klopca"
@@ -24563,5 +24803,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr ""
@@ -24621,11 +24861,241 @@
 msgstr ""
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr ""
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr ""
@@ -24633,20 +25103,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr ""
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr ""
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr ""
@@ -24654,10 +25124,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr ""
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr ""
@@ -24665,30 +25135,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr ""
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr ""
@@ -24696,10 +25166,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
@@ -24710,5 +25180,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -24716,11 +25186,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr ""
@@ -24728,78 +25198,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr ""
@@ -24807,17 +25278,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr ""
@@ -24825,9 +25308,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pivnica"
@@ -24835,19 +25319,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr ""
@@ -24855,9 +25340,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr ""
@@ -24865,24 +25351,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Muzej"
@@ -24890,9 +25377,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -24901,9 +25388,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -24911,24 +25398,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Umetnina"
@@ -24936,5 +25423,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Uredi umetnino"
@@ -24942,19 +25429,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Zemljevid"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -24992,5 +25479,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24998,28 +25485,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25029,5 +25516,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25035,5 +25522,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr ""
@@ -25041,6 +25528,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Kolesarjenje"
@@ -25048,5 +25535,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25054,6 +25541,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Smučanje"
@@ -25061,5 +25548,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25067,46 +25554,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25115,5 +25602,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25121,29 +25608,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr ""
@@ -25151,25 +25638,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Grad"
@@ -25178,19 +25665,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -25199,9 +25686,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr ""
@@ -25209,10 +25696,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25220,5 +25707,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25226,15 +25713,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr ""
@@ -25242,55 +25729,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Igrišče"
@@ -25298,35 +25785,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -25340,6 +25827,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -25755,6 +26242,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -25789,240 +26276,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr ""
@@ -26064,23 +26551,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "vrsta"
@@ -26122,211 +26609,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
@@ -26334,52 +26821,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Strelišče"
@@ -26387,204 +26874,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Zgradba"
@@ -26592,5 +27079,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -26598,10 +27085,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -26609,10 +27096,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -26620,10 +27107,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -26632,10 +27119,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Zapor"
@@ -26644,10 +27131,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Policijska postaja"
@@ -26657,10 +27144,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -26669,10 +27156,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Pošta"
@@ -26680,5 +27167,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -26686,15 +27173,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Šola"
@@ -26702,10 +27189,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr ""
@@ -26713,10 +27200,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr ""
@@ -26724,5 +27211,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr ""
@@ -26730,5 +27217,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -26737,10 +27224,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Knjižnica"
@@ -26749,9 +27236,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr ""
@@ -26759,10 +27246,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Gledališče"
@@ -26771,10 +27258,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -26784,5 +27271,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -26791,6 +27278,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Vera"
@@ -26799,66 +27286,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr ""
@@ -26867,81 +27354,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Naslovi"
@@ -26950,5 +27437,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -26956,5 +27443,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr ""
@@ -26962,25 +27449,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Ime ceste"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr ""
@@ -26989,5 +27476,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -26995,61 +27482,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Stolp"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27057,25 +27544,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -27083,10 +27570,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -27094,10 +27581,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -27106,41 +27593,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -27150,10 +27637,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Žerjav"
@@ -27161,5 +27648,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
@@ -27167,10 +27654,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -27178,10 +27665,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -27189,23 +27676,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr ""
@@ -27215,35 +27702,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr ""
@@ -27252,10 +27739,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr ""
@@ -27264,5 +27751,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27270,10 +27757,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -27284,23 +27771,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr ""
@@ -27309,20 +27796,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27330,55 +27817,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Stranišča"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefon"
@@ -27387,5 +27874,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -27393,5 +27880,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Kovanci"
@@ -27399,5 +27886,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Bankovci"
@@ -27405,5 +27892,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -27411,5 +27898,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -27417,15 +27904,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -27434,5 +27921,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -27440,35 +27927,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27476,5 +27963,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27483,31 +27970,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -27586,5 +28073,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27594,31 +28081,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -27627,30 +28114,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr ""
@@ -27659,10 +28146,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -27671,10 +28158,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27683,5 +28170,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27689,5 +28176,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -27695,15 +28182,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27711,10 +28198,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27723,28 +28210,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr ""
@@ -27752,9 +28239,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr ""
@@ -27762,27 +28249,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Mesar"
@@ -27790,9 +28277,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Uredi mesarja"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Pekarna"
@@ -27800,9 +28287,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Uredi pekarno"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr ""
@@ -27810,18 +28297,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr ""
@@ -27829,54 +28316,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr ""
@@ -27884,9 +28371,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr ""
@@ -27894,9 +28381,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -27904,54 +28391,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -27959,9 +28446,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Uredi čistilnico"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Pralnica"
@@ -27969,9 +28456,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Uredi pralnico"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr ""
@@ -27979,24 +28466,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -28004,5 +28491,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -28010,97 +28497,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banka"
@@ -28108,14 +28595,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Uredi banko"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -28123,5 +28610,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -28129,15 +28616,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr ""
@@ -28145,18 +28632,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -28164,5 +28651,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -28170,9 +28657,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -28180,10 +28667,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr ""
@@ -28192,5 +28679,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28199,20 +28686,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr ""
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -28220,5 +28702,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr ""
@@ -28227,64 +28709,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Kraji"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Država"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Uredi državo"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr ""
@@ -28292,15 +28774,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr ""
@@ -28308,10 +28790,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr ""
@@ -28319,25 +28801,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Vas"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -28345,5 +28827,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr ""
@@ -28351,10 +28833,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Otok"
@@ -28362,10 +28844,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Uredi otok"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28373,5 +28855,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28379,5 +28861,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr ""
@@ -28385,10 +28867,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Vrh"
@@ -28396,10 +28878,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr ""
@@ -28407,10 +28889,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr ""
@@ -28418,70 +28900,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Drevo"
@@ -28490,15 +28972,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr ""
@@ -28507,5 +28989,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr ""
@@ -28513,17 +28995,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Gozd"
@@ -28532,14 +29014,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -28547,25 +29029,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -28573,10 +29055,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr ""
@@ -28584,5 +29066,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr ""
@@ -28590,5 +29072,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr ""
@@ -28597,45 +29079,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28643,25 +29125,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -28669,10 +29151,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr ""
@@ -28680,20 +29162,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr ""
@@ -28701,5 +29183,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -28707,15 +29189,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -28723,9 +29205,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr ""
@@ -28733,39 +29215,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -28773,15 +29255,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr ""
@@ -28789,50 +29271,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
@@ -28842,5 +29324,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28852,5 +29334,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr ""
@@ -28858,5 +29340,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr ""
@@ -28864,5 +29346,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -28873,5 +29355,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -28879,36 +29361,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -28916,5 +29398,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr ""
@@ -28923,5 +29405,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -28929,34 +29411,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr ""
@@ -28965,15 +29447,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr ""
@@ -28981,5 +29463,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr ""
@@ -28988,5 +29470,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr ""
@@ -28994,5 +29476,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr ""
@@ -29100,5 +29582,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29109,17 +29591,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29187,5 +29669,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29195,9 +29677,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29211,10 +29693,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29222,31 +29704,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr ""
@@ -29255,30 +29737,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30456,16 +30938,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr ""
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33384,14 +33854,4 @@
 msgstr ""
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Izbrana pot ne vsebuje izbranega vozlišča."
-#~ msgstr[1] "Izbrana pot ne vsebuje izbranih vozlišč."
-#~ msgstr[2] "Izbrana pot ne vsebuje izbranih vozlišč."
-#~ msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Stopinje Minute Sekunde"
-
 #~ msgid "Move"
 #~ msgstr "Premakni"
@@ -33687,4 +34147,7 @@
 #~ msgstr "Oprostite, to ne deluje z anonimnimi uporabniki"
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Stopinje Minute Sekunde"
+
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
@@ -33726,4 +34189,11 @@
 #~ msgstr "Izbrano je le eno vozlišče"
 
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Izbrana pot ne vsebuje izbranega vozlišča."
+#~ msgstr[1] "Izbrana pot ne vsebuje izbranih vozlišč."
+#~ msgstr[2] "Izbrana pot ne vsebuje izbranih vozlišč."
+#~ msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč."
+
 #~ msgid "Update Selection"
 #~ msgstr "Posodobi izbor"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 22626)
+++ applications/editors/josm/i18n/po/sv.po	(revision 22628)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
 "PO-Revision-Date: 2010-06-07 08:48+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:58+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -228,4 +228,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -237,4 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -299,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Avbryt"
@@ -365,4 +367,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -421,5 +424,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1381,5 +1384,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1449,4 +1452,53 @@
 msgid "Preferences"
 msgstr "Inställningar"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Lantmätare..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "hamburgare"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Konfigurera hämtställen för insticksmoduler"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "utöka urval"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1488,4 +1540,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1724,4 +1777,5 @@
 msgstr "Välj åtminstone en sträcka att förenkla."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1729,4 +1783,5 @@
 #: ../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 "Ja"
@@ -1776,8 +1831,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Det går inte att dela baserat på nuvarande urval."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2986,4 +3040,5 @@
 
 #. 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
@@ -3013,5 +3068,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3224,8 +3279,12 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"Du håller på att ta bort noder utanför det område som du har hämtat hem.<br> "
+"Detta kan leda till problem eftersom andra objekt (som du inte ser) kanske "
+"använder dem.<br> Vill du verkligen ta bort dem?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3256,10 +3315,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3269,4 +3323,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3647,5 +3707,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3655,6 +3715,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3664,10 +3724,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3675,5 +3737,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3682,5 +3744,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3688,4 +3750,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3982,5 +4052,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "järnväg"
@@ -4254,69 +4324,69 @@
 msgstr "Lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "användning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "alternativ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Visa denna hjälptext"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standard unix-geometri-argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Hämta hem området inom gränsvärdena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Hämta området innanför gränsvärden som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Gör urval med angivet sökkriterium"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Öppna i maximerat läge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Återställ inställningarna till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4326,9 +4396,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "exempel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4336,45 +4406,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Initierar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Hämtar tidiga insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Anger förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Skapar huvudgränssnittet"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Hämtar insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4383,14 +4453,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Arkiv"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4409,10 +4495,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Visa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4420,5 +4506,5 @@
 msgstr "Verktyg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4426,5 +4512,5 @@
 msgstr "Snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4435,5 +4521,5 @@
 msgstr "Meny: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Ljud"
@@ -4531,17 +4617,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Tillfartsväg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "kinesiskt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Affärsområde"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5249,5 +5332,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "alla"
@@ -5884,5 +5967,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Relationer"
@@ -5976,10 +6059,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6580,4 +6663,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7039,5 +7124,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7081,111 +7165,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Namn"
@@ -8217,21 +8302,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8241,10 +8330,10 @@
 "hem området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Gränsvärden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8253,15 +8342,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8407,8 +8496,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Typ"
@@ -8437,6 +8526,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "okänd"
@@ -8824,7 +8913,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Skriv in din kommentar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9015,7 +9103,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9324,12 +9414,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Återställ"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Fortsätt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9355,7 +9443,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Visa inte igen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9538,5 +9625,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9717,5 +9804,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Beskrivning"
@@ -11368,5 +11455,5 @@
 msgstr "Färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11377,35 +11464,35 @@
 msgstr "Alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Lokala filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Inget"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Tvinga linjer om inga segment importerats."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Rita stora GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet (röd = långsam, grön = snabb)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "En enda färg (kan anpassas för namngivna lager)"
@@ -11413,5 +11500,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11433,5 +11520,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11473,5 +11560,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11485,16 +11572,16 @@
 msgstr "Fotgängare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Rita riktningspilar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Snabb ritning (ser sämre ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -11503,48 +11590,54 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Enbart på en sträckas huvud."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Rita ut segmentens ordningsnummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Rita gränser för hämtade data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Rita virtuella noder i urvalsläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Rita inaktiva lager i avvikande färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Mjuk kartgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Upphovsman"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Båt"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11554,9 +11647,9 @@
 "tillgängliga sträckpunkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Rita linjer mellan råa GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11566,9 +11659,9 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11577,10 +11670,10 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maxlängd (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -11589,10 +11682,10 @@
 "linjeinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Rita riktningspilar för linjer, som förbinder GPS-punkter"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -11601,5 +11694,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11609,13 +11702,13 @@
 "senast ritade pil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minimiavstånd (pixlar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Rita större punkter för GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11625,9 +11718,9 @@
 "hjälp av lagerhanteraren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Färglägg punkter och spåravsnitt baserat på hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11635,46 +11728,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Spår- och punktfärgläggning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "WayPoint-bild"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Rita riktningsanvisningar för delsträckor."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Rita ordningsnummer för alla delsträckor inom deras sträcka."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rita gränser för data hämtade från servern."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -11682,9 +11774,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Rita de inaktiva datalagren i avvikande färg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -12055,7 +12147,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Lager för att utföra mätningar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12896,5 +12987,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14468,5 +14559,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14494,5 +14585,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14737,5 +14828,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -15184,5 +15275,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Byggnader"
@@ -15419,5 +15510,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -18019,13 +18110,13 @@
 msgstr "Husrad"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Redigera skoaffär"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Avgränsare"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -19105,5 +19196,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21082,5 +21173,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Referens"
@@ -21619,5 +21710,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21630,5 +21721,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "skog"
@@ -21906,4 +21997,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21932,9 +22085,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "ja"
@@ -22044,9 +22228,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "nej"
@@ -22470,5 +22685,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22503,5 +22718,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22515,5 +22730,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22642,4 +22865,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22671,14 +22902,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operatör"
@@ -22940,12 +23175,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Höjd"
@@ -23797,5 +24032,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Spänning"
@@ -24107,6 +24342,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24158,32 +24395,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Öppettider"
@@ -24192,4 +24429,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24242,174 +24480,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24439,7 +24677,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Referensnummer"
@@ -24455,5 +24693,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "underjordisk"
@@ -24466,6 +24704,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Avgift"
@@ -24641,5 +24879,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "Rullstol"
@@ -24676,6 +24914,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Vindskydd"
@@ -24683,5 +24921,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Bänk"
@@ -24800,5 +25038,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -24858,11 +25096,241 @@
 msgstr "Redigera ett hotell"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Stjärnor"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefonnummer"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motell"
@@ -24870,20 +25338,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Redigera ett motell"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Pensionat"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Redigera pensionat"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Fäbod"
@@ -24891,10 +25359,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Redigera fäbod"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Vandrarhem"
@@ -24902,30 +25370,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Redigera ett vandrarhem"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Alphydda"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Redigera alphydda"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Husvagnscamping"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Redigera en husvagnscamping"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Campingplats"
@@ -24933,10 +25401,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Redigera en campingplats"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
@@ -24947,5 +25415,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurang"
@@ -24953,11 +25421,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Redigera en restaurang"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Kök"
@@ -24965,78 +25433,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italienskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -25044,17 +25513,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kafé"
@@ -25062,9 +25543,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Redigera kafé"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -25072,19 +25554,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Redigera pub"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr ""
@@ -25092,9 +25575,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -25102,24 +25586,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Redigera nattklubb"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Museum"
@@ -25127,9 +25612,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Redigera museum"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Zoo"
@@ -25138,9 +25623,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Redigera zoo"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -25148,24 +25633,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Nöjespark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Redigera en nöjespark"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Konst"
@@ -25173,5 +25658,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Redigera konstverk"
@@ -25179,19 +25664,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Karta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25229,5 +25714,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25235,28 +25720,28 @@
 msgstr "gata"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25266,5 +25751,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Rutter visas för:"
@@ -25272,5 +25757,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "Vandringsled"
@@ -25278,6 +25763,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Cykling"
@@ -25285,5 +25770,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25291,6 +25776,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -25298,5 +25783,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25304,46 +25789,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Informationstavla"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "historiskt"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "djurliv"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25352,5 +25837,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25358,29 +25843,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Redigera vindskydd"
@@ -25388,25 +25873,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Eldstad"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Picknickplats"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Redigera picknickplats"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Slott"
@@ -25415,19 +25900,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -25436,9 +25921,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Redigera utgrävningsplats"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Krigsskådeplats"
@@ -25446,10 +25931,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Redigera krigsskådeplats"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Paleografisk plats"
@@ -25457,5 +25942,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Redigera paleografisk plats"
@@ -25463,15 +25948,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -25479,55 +25964,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Lekplats"
@@ -25535,35 +26020,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Idrott"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -25577,6 +26062,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "välj sport:"
@@ -25992,6 +26477,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26026,240 +26511,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Plan"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Flera"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -26301,23 +26786,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "typ"
@@ -26359,211 +26844,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "plan"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "sporthall"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Simning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Redigera simning"
@@ -26571,52 +27056,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Skytte"
@@ -26624,204 +27109,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basket"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Byggnad"
@@ -26829,5 +27314,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -26835,10 +27320,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Stadshus"
@@ -26846,10 +27331,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Ambassad"
@@ -26857,10 +27342,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Domstol"
@@ -26869,10 +27354,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Fängelse"
@@ -26881,10 +27366,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Polisstation"
@@ -26894,10 +27379,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -26906,10 +27391,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Postkontor"
@@ -26917,5 +27402,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -26923,15 +27408,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Skola"
@@ -26939,10 +27424,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Högskola/universitet"
@@ -26950,10 +27435,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Högskola"
@@ -26961,5 +27446,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -26967,5 +27452,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Biograf"
@@ -26974,10 +27459,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Bibliotek"
@@ -26986,9 +27471,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -26996,10 +27481,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Teater"
@@ -27008,10 +27493,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -27021,5 +27506,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -27028,6 +27513,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Religion"
@@ -27036,66 +27521,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Samfund"
@@ -27104,81 +27589,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adresser"
@@ -27187,5 +27672,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Redigera adressinformation"
@@ -27193,5 +27678,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Husnummer"
@@ -27199,25 +27684,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Gatunamn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Landskod"
@@ -27226,5 +27711,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Redigera adressinterpolation"
@@ -27232,61 +27717,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27294,25 +27779,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -27320,10 +27805,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -27331,10 +27816,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -27343,41 +27828,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "naturgas"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Plats"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -27387,10 +27872,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Kran"
@@ -27398,5 +27883,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Redigera kran"
@@ -27404,10 +27889,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -27415,10 +27900,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -27426,23 +27911,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Redigera övervakningskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -27452,35 +27937,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "solkraft"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -27489,10 +27974,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -27501,5 +27986,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -27507,10 +27992,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -27521,23 +28006,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -27546,20 +28031,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27567,55 +28052,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefon"
@@ -27624,5 +28109,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -27630,5 +28115,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Mynt"
@@ -27636,5 +28121,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Anteckningar"
@@ -27642,5 +28127,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -27648,5 +28133,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -27654,15 +28139,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Återvinning"
@@ -27671,5 +28156,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -27677,35 +28162,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27713,5 +28198,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27720,31 +28205,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -27823,5 +28308,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27831,31 +28316,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
@@ -27864,30 +28349,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Dölj"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Fontän"
@@ -27896,10 +28381,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -27908,10 +28393,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27920,5 +28405,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27926,5 +28411,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr ""
@@ -27932,15 +28417,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27948,10 +28433,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Redigera bilförsäljare"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27960,28 +28445,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Redigera cykelaffär"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Hygien"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Redigera hygienbutik"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -27989,9 +28474,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27999,27 +28484,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Redigera bokhandel"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Resebyrå"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Redigera resebyrå"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "Slakteri"
@@ -28027,9 +28512,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Redigera slakteri"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Bageri"
@@ -28037,9 +28522,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Redigera bageri"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Florist"
@@ -28047,18 +28532,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Redigera florist"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -28066,54 +28551,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Redigera alkoholbutik"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Drycker"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Dator"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -28121,9 +28606,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Redigera trädgårdscenter"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -28131,9 +28616,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Redigera järnaffär"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -28141,54 +28626,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Redigera gör-det-själv-affär"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Redigera hårfrisör"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Skor"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Videobutik"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -28196,9 +28681,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Redigera kemtvätt"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -28206,9 +28691,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Redigera tvätteri"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -28216,24 +28701,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Redigera affär för friluftsliv"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Automat"
@@ -28241,5 +28726,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -28247,97 +28732,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Bank"
@@ -28345,14 +28830,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Redigera bank"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -28360,5 +28845,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -28366,15 +28851,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Läkare"
@@ -28382,18 +28867,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -28401,5 +28886,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -28407,9 +28892,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -28417,10 +28902,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr ""
@@ -28429,5 +28914,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -28436,20 +28921,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -28457,5 +28937,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -28464,64 +28944,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Platser"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Redigera land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Delstat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Län"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Redigera län"
@@ -28529,15 +29009,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Småstad"
@@ -28545,10 +29025,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Förort"
@@ -28556,25 +29036,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -28582,5 +29062,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Plats"
@@ -28588,10 +29068,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Ö"
@@ -28599,10 +29079,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Redigera ö"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Holme"
@@ -28610,5 +29090,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Redigera holme"
@@ -28616,5 +29096,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -28622,10 +29102,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Topp"
@@ -28633,10 +29113,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Glaciär"
@@ -28644,10 +29124,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Vulkan"
@@ -28655,70 +29135,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Nationell"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Träd"
@@ -28727,15 +29207,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Naturskog"
@@ -28744,5 +29224,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -28750,17 +29230,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Kulturskog"
@@ -28769,14 +29249,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -28784,25 +29264,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Höglandshed"
@@ -28810,10 +29290,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Hed"
@@ -28821,5 +29301,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Redigera hed"
@@ -28827,5 +29307,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -28834,45 +29314,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Äng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -28880,25 +29360,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Gräs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Allmänning"
@@ -28906,10 +29386,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Redigera användning av mark för allmänning"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Allmänning"
@@ -28917,20 +29397,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -28938,5 +29418,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -28944,15 +29424,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Redigera användning av mark för bostadsområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -28960,9 +29440,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -28970,39 +29450,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Redigera användning av mark för affärsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -29010,15 +29490,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Redigera användning av mark för järnvägsmark"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Militärt område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -29026,50 +29506,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Redigera användning av mark för deponi av avfall"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
@@ -29079,5 +29559,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -29089,5 +29569,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "yttre segement"
@@ -29095,5 +29575,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "inre segment"
@@ -29101,5 +29581,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29110,5 +29590,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29116,36 +29596,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29153,5 +29633,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr ""
@@ -29160,5 +29640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -29166,34 +29646,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -29202,15 +29682,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "till sträcka"
@@ -29218,5 +29698,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Rutt"
@@ -29225,5 +29705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Redigera rutt"
@@ -29231,5 +29711,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Ruttyp"
@@ -29337,5 +29817,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29346,17 +29826,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29424,5 +29904,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29432,9 +29912,9 @@
 msgstr "fot"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29448,10 +29928,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29459,31 +29939,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr ""
@@ -29492,30 +29972,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30693,16 +31173,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33621,12 +34089,4 @@
 msgstr ""
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Den valda sträckan innehåller inte den valda noden."
-#~ msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Grader Minuter Sekunder"
-
 #~ msgid "Move"
 #~ msgstr "Flytta"
@@ -33693,12 +34153,8 @@
 #~ msgstr "En avslutande parentes förväntades"
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "Du håller på att ta bort noder utanför det område som du har hämtat hem."
-#~ "<br> Detta kan leda till problem eftersom andra objekt (som du inte ser) "
-#~ "kanske använder dem.<br> Vill du verkligen ta bort dem?"
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Den valda sträckan innehåller inte den valda noden."
+#~ msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
 
 #~ msgid "Conflicting relation"
@@ -34068,4 +34524,7 @@
 #~ msgid "Plugin already exists"
 #~ msgstr "Insticksmodulen finns redan"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Grader Minuter Sekunder"
 
 #~ msgid "Only two nodes allowed"
@@ -34465,7 +34924,4 @@
 #~ msgstr "Tagg för källa har automatiskt lagts till:"
 
-#~ msgid "Continue anyway"
-#~ msgstr "Fortsätt ändå"
-
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 22626)
+++ applications/editors/josm/i18n/po/tr.po	(revision 22628)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 13:26+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-06 20:50+0000\n"
 "Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Türkçe\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:54+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -27,6 +27,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -124,6 +124,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -226,4 +226,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -235,4 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -242,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -297,5 +299,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "İptal"
@@ -361,4 +363,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -417,5 +420,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1360,5 +1363,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1423,4 +1426,53 @@
 msgid "Preferences"
 msgstr "Tercihler"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Ölçüm..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "burger"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Eklenti sitelerini ayarla"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "seçime ekleyiniz"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1462,4 +1514,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1695,4 +1748,5 @@
 msgstr "Lütfen basitleştime için en az bir yol seçiniz."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1700,4 +1754,5 @@
 #: ../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 ""
@@ -1745,8 +1800,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Yapılan seçim bölme için kullanılamaz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -2905,4 +2959,5 @@
 
 #. 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
@@ -2932,5 +2987,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "OK"
@@ -3140,8 +3195,11 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
-msgstr ""
+"because you don''t see the real object.<br>Do you really want to delete?"
+msgstr ""
+"İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.<br>Göremediğiniz başka "
+"objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42
@@ -3172,10 +3230,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3185,4 +3238,10 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3563,5 +3622,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3571,6 +3630,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3580,10 +3639,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3591,5 +3652,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3598,5 +3659,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3604,4 +3665,12 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
+msgstr ""
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
 msgstr ""
 
@@ -3895,5 +3964,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "demiryolu"
@@ -4166,69 +4235,69 @@
 msgstr "şifre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "kullanım"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "seçenekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Bu Yardımı Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Standart unix geometry argümanı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Kutu ile belirlenen sınırları indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Kutu ile belirlenen alanı ham gps olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Yapılan aramaya göre seçim yap"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Tercihleri varsayılan değerlere getir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4238,9 +4307,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "örnekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4248,45 +4317,45 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Ayarlar Okunuyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Eski eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Varsayılan ayarlar alınıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Arayüz Oluşturuluyor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4295,14 +4364,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Dosya"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4321,10 +4406,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Görünüm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4332,5 +4417,5 @@
 msgstr "Araçlar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4338,5 +4423,5 @@
 msgstr "Ayarlanmış"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4347,5 +4432,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Ses"
@@ -4443,17 +4528,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Servis"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "çinli"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Ticari"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5161,5 +5243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "hepsi"
@@ -5793,5 +5875,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "İlişkiler"
@@ -5885,10 +5967,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr ""
@@ -6487,4 +6569,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6946,5 +7030,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -6988,111 +7071,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "İsim"
@@ -8122,21 +8206,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8144,10 +8232,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Sınır Çerçevesi"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8156,15 +8244,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8309,8 +8397,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Tip"
@@ -8339,6 +8427,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "bilinmeyen"
@@ -8721,7 +8809,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Yorumunu Ekle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -8912,7 +8999,9 @@
 msgstr ""
 
+#. 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 ""
@@ -9221,12 +9310,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "Reset"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Devam et"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9252,7 +9339,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Tekrar Gösterme"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9435,5 +9521,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9614,5 +9700,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr ""
@@ -11243,5 +11329,5 @@
 msgstr "Renkler"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11252,35 +11338,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Herhangi bir segment içeri alınmadıysa çizgileri zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Geniş gps noktaları çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -11288,5 +11374,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11308,5 +11394,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11348,5 +11434,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11360,64 +11446,70 @@
 msgstr "Ayak"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Yön oklarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Hızlı Çizim (kötü görünür)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Sadece yolun başında"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Segment sıra numaralarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "İndirilen alan için sınırları çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Seçim modunda sanal kavşakları çiziniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Pasif tabakaları başka renkte çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Düzgün harita grafikleri (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "yazar"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Boat"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11426,9 +11518,9 @@
 "GPX dosyası açılınca otomatik olarak yol noktalarından imleç tabakası oluştur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11436,9 +11528,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -11447,25 +11539,25 @@
 "''-1'' yap."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Maximum uzunluk (metre)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Gelen çizimde herhangi bilgi olmasa bile çizime zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPS noktalarını bağlayan yönler için okları çiz."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Yön çizgi okları için tablo değerlerini kullan hesap yapma."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11473,13 +11565,13 @@
 msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Minimum uzaklık (pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "GPS noktaları için geniş nokta çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11487,9 +11579,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11497,55 +11589,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Yol noktaları görüntüsü"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS Noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Yol segmentleri için yön ipuçları çiz."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Her segment için kendi yolu buyunca sıra numarası çiz."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Daha düzgün harita grafikleri için 'antialiasing' uygula  ."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Server'dan gelen bilginin sınırlarını çiz ."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Pasif tabakaları farklı renklerde çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -11914,7 +12005,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Ölçüm tabakası"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12754,5 +12844,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14320,5 +14410,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14345,5 +14435,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14587,5 +14677,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -15034,5 +15124,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Binalar"
@@ -15269,5 +15359,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -17848,13 +17938,13 @@
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "dere düzenle"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Ayıraç"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18931,5 +19021,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr ""
@@ -20896,5 +20986,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Referans"
@@ -21433,5 +21523,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr ""
@@ -21444,5 +21534,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "orman"
@@ -21720,4 +21810,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -21746,9 +21898,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "Evet"
@@ -21858,9 +22041,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "hayır"
@@ -22284,5 +22498,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr ""
@@ -22317,5 +22531,5 @@
 msgstr ""
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr ""
@@ -22329,5 +22543,13 @@
 msgstr ""
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr ""
@@ -22456,4 +22678,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22485,14 +22715,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Operator"
@@ -22754,12 +22988,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "yükseklik"
@@ -23611,5 +23845,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Voltaj"
@@ -23921,6 +24155,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -23972,32 +24208,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Açılış saati"
@@ -24006,4 +24242,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24056,174 +24293,174 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr ""
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr ""
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr ""
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24253,7 +24490,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Referans Numarası"
@@ -24269,5 +24506,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "yer altı"
@@ -24280,6 +24517,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Ücret"
@@ -24455,5 +24692,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "tekerlekli sandalye"
@@ -24490,6 +24727,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Sığınak"
@@ -24497,5 +24734,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "banket"
@@ -24614,5 +24851,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Fener"
@@ -24672,11 +24909,241 @@
 msgstr "Hotel Düzenle"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "terminal"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Telefon Numarası"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Motel"
@@ -24684,20 +25151,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Motel Düzenle"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Misafir Evi"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Misafir Evi Düzenle"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "kulübe"
@@ -24705,10 +25172,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "külübe düzenle"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Hostel"
@@ -24716,30 +25183,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Hostel Düzenle"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Dağcı Barakası"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Dağcı Barakası Düzenle"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Karavan Alanı"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Karavan Alanı Düzenle"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Kamp Sitesi"
@@ -24747,10 +25214,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Kamp Sitesi Düzenle"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Yüyecek+içecek"
@@ -24761,5 +25228,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -24767,11 +25234,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Restorant Düzenle"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "lokanta"
@@ -24779,78 +25246,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "italyan"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -24858,17 +25326,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast Food düzenle"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Kafe"
@@ -24876,9 +25356,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Cafe düzenle"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Pub"
@@ -24886,19 +25367,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Pub Düzenle"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr ""
@@ -24906,9 +25388,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "GeceKlubu"
@@ -24916,24 +25399,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "GeceKulubu Düzenle"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Müse"
@@ -24941,9 +25425,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Müze Düzenle"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -24952,9 +25436,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Hayvanat Bahçesi Düzenle"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -24962,24 +25446,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Lunapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Lunapark Düzenle"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Sanatsal"
@@ -24987,5 +25471,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Sanatsal Düzenle"
@@ -24993,19 +25477,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Harita"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25043,5 +25527,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25049,28 +25533,28 @@
 msgstr "sokak"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25080,5 +25564,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25086,5 +25570,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "gezme"
@@ -25092,6 +25576,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Bisiklet"
@@ -25099,5 +25583,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25105,6 +25589,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Kayak"
@@ -25112,5 +25596,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25118,46 +25602,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25166,5 +25650,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25172,29 +25656,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Sığınak Düzenle"
@@ -25202,25 +25686,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Mangal Alanı"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Piknik Alanı"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Piknik Alanı Düzenle"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "Kale"
@@ -25229,19 +25713,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -25250,9 +25734,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Arkeolojik Site Düzenle"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Savaş Alanı"
@@ -25260,10 +25744,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Savaş Alanı Düzenle"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25271,5 +25755,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25277,15 +25761,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Anıt"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Abide"
@@ -25293,55 +25777,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -25349,35 +25833,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -25391,6 +25875,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -25806,6 +26290,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -25840,240 +26324,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -26115,23 +26599,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "tip"
@@ -26173,211 +26657,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "spor_merkezi"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "stadyum"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "patinaj"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
@@ -26385,52 +26869,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -26438,204 +26922,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Raket"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Bina"
@@ -26643,5 +27127,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -26649,10 +27133,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "belediye binası"
@@ -26660,10 +27144,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -26671,10 +27155,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -26683,10 +27167,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "Hapishane"
@@ -26695,10 +27179,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Polis"
@@ -26708,10 +27192,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -26720,10 +27204,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Postane"
@@ -26731,5 +27215,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -26737,15 +27221,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Okul"
@@ -26753,10 +27237,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Universite"
@@ -26764,10 +27248,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "kolej"
@@ -26775,5 +27259,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -26781,5 +27265,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Sinema"
@@ -26788,10 +27272,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "kütüphane"
@@ -26800,9 +27284,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -26810,10 +27294,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -26822,10 +27306,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -26835,5 +27319,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -26842,6 +27326,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Din"
@@ -26850,66 +27334,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "mezhep"
@@ -26918,81 +27402,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Adres"
@@ -27001,5 +27485,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Adres Bilgileri Düzenle"
@@ -27007,5 +27491,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Ev no:"
@@ -27013,25 +27497,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Sokak Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -27040,5 +27524,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Adres İnterpolasyon Düzenle"
@@ -27046,61 +27530,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Tesis"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Kule"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr ""
@@ -27108,25 +27592,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -27134,10 +27618,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -27145,10 +27629,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -27157,41 +27641,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "benzin"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -27201,10 +27685,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Vinç"
@@ -27212,5 +27696,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
@@ -27218,10 +27702,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -27229,10 +27713,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -27240,23 +27724,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -27266,35 +27750,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -27303,10 +27787,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -27315,5 +27799,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -27321,10 +27805,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -27335,23 +27819,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -27360,20 +27844,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27381,55 +27865,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Tuvalet"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Telefon"
@@ -27438,5 +27922,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -27444,5 +27928,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Madeni Para"
@@ -27450,5 +27934,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Notlar"
@@ -27456,5 +27940,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -27462,5 +27946,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -27468,15 +27952,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -27485,5 +27969,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -27491,35 +27975,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27527,5 +28011,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27534,31 +28018,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr ""
@@ -27637,5 +28121,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -27645,31 +28129,31 @@
 msgstr "yeşil"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
@@ -27678,30 +28162,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Sakla"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Kilitle"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Kaynak"
@@ -27710,10 +28194,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -27722,10 +28206,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr ""
@@ -27734,5 +28218,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -27740,5 +28224,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -27746,15 +28230,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr ""
@@ -27762,10 +28246,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "araçlı alışveriş düzenle"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr ""
@@ -27774,28 +28258,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Bisiklet dükkanı düzenle"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Supermarket Düzenle"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -27803,9 +28287,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Bakkal Düzenle"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27813,27 +28297,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Kiosk Düzenle"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "kasap"
@@ -27841,9 +28325,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "kasap düzenle"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "fırın"
@@ -27851,9 +28335,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "fırın düzenle"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr ""
@@ -27861,18 +28345,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr ""
@@ -27880,54 +28364,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr ""
@@ -27935,9 +28419,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr ""
@@ -27945,9 +28429,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "kendin-al-market"
@@ -27955,54 +28439,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "kendin-al-market düzenle"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "berber"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "berber düzenle"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Kuru Temizleme"
@@ -28010,9 +28494,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Kuru Temizleme Düzenle"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Çamaşırhane"
@@ -28020,9 +28504,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Çamaşırhane Düzenle"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Dışortam"
@@ -28030,24 +28514,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Dış ortam dükkanları düzenle"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -28055,5 +28539,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Kahve Makinası Düzenle"
@@ -28061,97 +28545,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Banka"
@@ -28159,14 +28643,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Banka düzenle"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -28174,5 +28658,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Döviz Bürosu Düzenle"
@@ -28180,15 +28664,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Doktor"
@@ -28196,18 +28680,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Doktor Düzenle"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -28215,5 +28699,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Eczane Düzenle"
@@ -28221,9 +28705,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "Dispenser"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Hastane"
@@ -28231,10 +28715,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -28243,5 +28727,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -28250,20 +28734,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Telefon Numarası"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -28271,5 +28750,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -28278,64 +28757,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Yerler"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Kıta"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Ülke"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "İl"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Bölge"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "vilayet"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "vilayet Düzenle"
@@ -28343,15 +28822,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Şehir"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Mahalle"
@@ -28359,10 +28838,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Banliyo"
@@ -28370,25 +28849,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Köy"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
@@ -28396,5 +28875,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Semt"
@@ -28402,10 +28881,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Ada"
@@ -28413,10 +28892,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Ada Düzenle"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28424,5 +28903,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28430,5 +28909,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -28436,10 +28915,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Mağara Girişi Düzenle"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Zirve"
@@ -28447,10 +28926,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Zirve Düzenle"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Buzul"
@@ -28458,10 +28937,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Buzul Düzenle"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Volkan"
@@ -28469,70 +28948,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Volkan Düzenle"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Milli"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "İdari"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Sivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Ağaç"
@@ -28541,15 +29020,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Orman"
@@ -28558,5 +29037,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Orman Düzenle"
@@ -28564,17 +29043,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "Kozalaklı Orman"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "orman"
@@ -28583,14 +29062,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "orman kullanımı düzenle"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
@@ -28598,25 +29077,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Taşlık Alan"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Taşlık Alan Düzenle"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Çalılık"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Çalılık Düzenle"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Dağ Eteği"
@@ -28624,10 +29103,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Dağ Eteği Kullanımı"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Sağlıksız Ağaç"
@@ -28635,5 +29114,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Sağlıksız Ağaç Düzenle"
@@ -28641,5 +29120,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -28648,45 +29127,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -28694,25 +29173,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Otlak"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -28720,10 +29199,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Genel"
@@ -28731,20 +29210,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -28752,5 +29231,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -28758,15 +29237,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -28774,9 +29253,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -28784,39 +29263,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Perakende"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -28824,15 +29303,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Askeri"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -28840,50 +29319,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
@@ -28893,5 +29372,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr ""
@@ -28903,5 +29382,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr ""
@@ -28909,5 +29388,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr ""
@@ -28915,5 +29394,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -28924,5 +29403,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -28930,36 +29409,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -28967,5 +29446,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr ""
@@ -28974,5 +29453,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -28980,34 +29459,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr ""
@@ -29016,15 +29495,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr ""
@@ -29032,5 +29511,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr ""
@@ -29039,5 +29518,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr ""
@@ -29045,5 +29524,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr ""
@@ -29151,5 +29630,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29160,17 +29639,17 @@
 msgstr "bisiklet"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29238,5 +29717,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29246,9 +29725,9 @@
 msgstr "ayak"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29262,10 +29741,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29273,31 +29752,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr ""
@@ -29306,30 +29785,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30507,16 +30986,4 @@
 msgstr "havayolu"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "terminal"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -33435,11 +33902,4 @@
 msgstr "Sicilya - İtalya"
 
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "Seçili yol seçili kavşakları içermiyor."
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Derece Dakika Saniye"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -33759,13 +34219,4 @@
 #~ msgstr "Yol segmentini ayrıştır"
 
-#~ msgid ""
-#~ "You are about to delete nodes outside of the area you have downloaded."
-#~ "<br>This can cause problems because other objects (that you don't see) "
-#~ "might use them.<br>Do you really want to delete?"
-#~ msgstr ""
-#~ "İndirdiğiniz alan dışındaki bir kavşağı sileceksiniz.<br>Göremediğiniz "
-#~ "başka objeler onu kullanıyor olabilir. <br>Gerçekten silmek "
-#~ "istiyormusunuz?"
-
 #~ msgid "true"
 #~ msgstr "doğru"
@@ -33776,4 +34227,7 @@
 #~ msgid "different"
 #~ msgstr "farklı"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Derece Dakika Saniye"
 
 #~ msgid ""
@@ -33847,4 +34301,8 @@
 #~ msgid "Email"
 #~ msgstr "E-Mail"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "Seçili yol seçili kavşakları içermiyor."
 
 #~ msgid "unnamed"
Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 22626)
+++ applications/editors/josm/i18n/po/uk.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-29 14:54+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-11 14:51+0000\n"
 "Last-Translator: andygol <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 21:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -26,6 +26,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -231,4 +231,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -240,4 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -247,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -302,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "Скасувати"
@@ -370,4 +372,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -426,5 +429,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -721,5 +724,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download map data from the OSM server."
-msgstr "Завантажити дані мапи з серверу OSM."
+msgstr "Завантажити дані мапи з сервера OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
@@ -1404,5 +1407,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1471,4 +1474,53 @@
 msgid "Preferences"
 msgstr "Налаштування"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "Землемір…"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "бутерброди"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "Налаштувати сайти втулків"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "додати до виділеного"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1510,4 +1562,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1747,4 +1800,5 @@
 msgstr "Виберіть хоча б одну лінію для спрощення."
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1752,4 +1806,5 @@
 #: ../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 "Так"
@@ -1802,8 +1857,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "Поточне виділення неможливо розділити."
+msgstr ""
+"Поточне виділення неможливо використати для розділення - не виділено точку."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -3060,4 +3115,5 @@
 
 #. 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
@@ -3087,5 +3143,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "Так"
@@ -3305,7 +3361,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "Ви намагаєтесь вилучити неповні об’єкти.<br>Це може призвести до проблем, "
@@ -3341,10 +3398,5 @@
 msgstr[2] "Перемістити {0} точок"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "Очищений об’єкт ''{0}''"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3355,4 +3407,10 @@
 msgstr[2] "Очищено {0} об’єктів"
 
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Очищений об’єкт ''{0}''"
+
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
@@ -3520,15 +3578,15 @@
 #, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr ""
+msgstr "Не можливо вилучити старий резервний файл {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr ""
+msgstr "Помилка під час створення резервної копії вилучаємого шару : {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
-msgstr ""
+msgstr "Неможливо прочитати автоматично збереженні osm-дані ({0}) - {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
@@ -3723,5 +3781,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "deg° min'' sec\""
-msgstr ""
+msgstr "град° хв'' сек\""
 
 #. *
@@ -3730,5 +3788,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "deg° min'' (Nautical)"
-msgstr ""
+msgstr "град° хв'' (Морські)"
 
 #. *
@@ -3765,5 +3823,5 @@
 msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3776,6 +3834,6 @@
 "помилка, але необхідно зберегти дані, перш ніж продовжити роботу."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3785,10 +3843,14 @@
 msgstr "Відсутній результат об’єднання для лінії з ідентифікатором {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "Відсутній результат об’єднання для об’єкта з ідентифікатором {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+"Об’єкт {0} з ідентифікатором {1} був позначений для вилучення, але він "
+"відсутній у первісному наборі даних."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3796,5 +3858,5 @@
 msgstr "Відсутній результат об’єднання для точки з ідентифікатором {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3803,5 +3865,5 @@
 msgstr "Відсутній результат об’єднання для зв’язку з ідентифікатором {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3810,4 +3872,13 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Відсутній результат об’єднання для типу {0} з ідентифікатором {1}"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
+"Конфлікт з атрибутом 'visible' для об’єкта типу {0} з ідентифікатором {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -4114,5 +4185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "залізниця"
@@ -4390,30 +4461,30 @@
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "використання"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "Показати цю довідку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "Стандартний аргумент геометрії unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "Завантажити ділянку в межах габаритного прямокутника"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 "Завантажити місцевість за посиланням (з параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4421,9 +4492,9 @@
 "Файл/Відкрити)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "Завантажити ділянку в межах габаритного прямокутника, як дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4431,33 +4502,33 @@
 "дані GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "Вибір з урахуванням пошуку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "Запуск у розгорнутому вигляді"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "Відновити типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "Встановити мову"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "системні налаштування Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "ШЛЯХ/ДО/ПАПКИ/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "Зміна папки для всіх налаштувань користувача"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4471,9 +4542,9 @@
 "виділеної пам’яті"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "приклади"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4483,5 +4554,5 @@
 "порядку."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
@@ -4489,41 +4560,41 @@
 "selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "Ініціалізація"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "Оновлення втулків…"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "Встановлення оновлених втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "Завантаження ранніх втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "Типові налаштування"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "Створення головного вікна"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "Завантаження втулків"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+msgstr "Незбережені osm-дані"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "Відновити"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4531,6 +4602,8 @@
 "time. Do you want to restore data?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+"JOSM знайнов незбережений шар {0} з osm-даними. Вони схожі на ті, що були "
+"перед останнім збоєм JOSM. Ви бажаєте відновити дані?"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4539,9 +4612,28 @@
 "використовується."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+"<h2>JOSM потребує Java версії 6.</h2>Ваша Java-машина має версію: {0}.<br>Ви "
+"можете <ul><li>оновити ваше Java оточення (JRE) або ж</li><li>використовуйте "
+"більш старішу (сумісну з Java 5) версію JOSM.</li></ul>Більш докладно:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr "Вийти з JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr "Продовжити, спробувати у будь-якому випадку"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "Файл"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4560,10 +4652,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "Вид"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4571,5 +4663,5 @@
 msgstr "Інструменти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4577,5 +4669,5 @@
 msgstr "Заготовки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4586,5 +4678,5 @@
 msgstr "Меню: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "Звук"
@@ -4684,17 +4776,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "Числовий"
+msgstr "Метрична"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "китайська"
+msgstr "Китайська"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "Діловий район"
+msgstr "Імперська"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5452,5 +5541,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "всі"
@@ -6115,5 +6204,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "Зв’язки"
@@ -6207,10 +6296,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "Вибрати зі списку зв’язків"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "Вибрати зв’язок зі списку зв’язків"
@@ -6826,4 +6915,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -7285,5 +7376,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7327,111 +7417,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "Назва"
@@ -8399,4 +8490,6 @@
 "current layer"
 msgstr ""
+"Члени з буферу обміну не можуть бути додані тому, що вони не належать до "
+"поточного шару"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8553,21 +8646,25 @@
 msgstr "Перейменувати вибрану закладку"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "мін. шир."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "мін. довг."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "макс. шир."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "макс. довг."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr "Очистити поле тексту"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8577,10 +8674,10 @@
 "ділянки)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "Габаритний прямокутник"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8589,15 +8686,15 @@
 msgstr "Рядок ''{0}''не є правильним подвійним значенням."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "Значення широти має бути в межах [-90,90]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Значення довготи має бути в межах [-180,180]."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8747,8 +8844,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "Тип"
@@ -8777,6 +8874,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "Невідомо"
@@ -9208,7 +9305,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "Невірний коментар для надсилання на сервер"
+msgstr "Введіть коментар до даних, що надсилаються на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9418,7 +9514,9 @@
 msgstr "Виберіть ім’я файлу"
 
+#. 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 "Ні"
@@ -9763,17 +9861,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "Невірний коментар для надсилання на сервер"
+msgstr "Будьласка, перегляньте свій коментар"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "У зворотному порядку"
+msgstr "Переглянути"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "Далі"
+msgstr "Продовжити так як є"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9785,22 +9880,26 @@
 "explain your change, you will make life<br />easier for many other mappers."
 msgstr ""
+"Ваш коментар — <i>порожній</i> або <i>дуже короткий</i>.<br /><br /"
+">Технічно, його можливо лишити таким, але зважте на те, що багато "
+"користувачів<br />переглядають зміни у цій ділянці бажають бачити зрозумілі "
+"пояснення<br />того, що тут було змінено!<br /><br />Якщо зараз ви витратите "
+"хвилину на пояснення того, що ви зробили,<br />це полегшити роботу інших "
+"учасників проекту."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
 msgid "Return to the previous dialog to enter a more descriptive comment"
-msgstr ""
+msgstr "Повернутись до попереднього вікна, щоб ввести більш докладний коментар"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "Скасувати і повернутися у редактор"
+msgstr "Відмінити  та повернутись до попереднього вікна"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
 msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "Ігнорувати це попередження та надіслати у будь-якому разі"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "Більше не показувати"
+msgstr "Більше не показувати це повідомлення"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -10022,5 +10121,5 @@
 msgstr[2] "Надсилання {0} об’єктів…"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -10223,5 +10322,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "Опис"
@@ -12006,5 +12105,5 @@
 msgstr "Кольори"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -12015,36 +12114,36 @@
 msgstr "Всі"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "Локальні файли"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "Нічого"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "Показувати лінії, навіть якщо немає імпортованих відрізків."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "Показувати GPS великими точками"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr ""
 "Показати значення HDOP (зниження точності в горизонтальній площині) колом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Швидкість (червоний = повільно, зелений = швидко)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Розведення Позицій (червоний = високо, зелений = низько, якщо такі є)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним кольором (може бути визначено для іменованих шарів)"
@@ -12052,5 +12151,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -12072,5 +12171,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -12112,5 +12211,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -12124,16 +12223,16 @@
 msgstr "Пішки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Показувати стрілки напрямку"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Швидке креслення (виглядає гірше)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -12142,49 +12241,54 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "Тільки на початку лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Показувати порядкові номери відрізків"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Показувати межі завантажених даних"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Показувати віртуальні точки в режимі вибору"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Показувати неактивні шари іншим кольором"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Згладжені лінії (антіаліасінг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "Створювати мітки читаючи GPX."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "Автор"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "Дизельне"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr "Авто"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr "Назва"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr "Опис"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "Північ"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr "Всі"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -12194,9 +12298,9 @@
 "шару."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "Показувати лінії між точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -12206,9 +12310,9 @@
 "щоб показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальна довжина для локальних файлів (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
@@ -12217,20 +12321,20 @@
 "показувати всі лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "Максимальна довжина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Показувати стрілки на лініях, що з’єднують точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -12239,5 +12343,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -12246,13 +12350,13 @@
 "Не показувати стрілки, якщо вони знаходяться близько від попередніх стрілок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "Мінімальна відстань (в пікселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "Показувати точки GPS великими."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -12262,9 +12366,9 @@
 "Менеджері Шарів."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "Позначати колір відрізків та точок треку в залежності від швидкості."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -12274,46 +12378,45 @@
 "Ваш пристрій захоплення для цього повинен реєструвати таку інформацію."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "Забарвлення треку та точок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+msgstr "Дозволяє змінити маркування треку."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "Опис точки шляху"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr "Маркування дорожніх точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "Показувати напрямок на відрізках ліній."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показувати порядкові номери на всіх відрізках лінії."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Застосувати згладжування мапи."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Показувати межі ділянки, завантаженої з сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -12321,9 +12424,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "Показувати неактивні шари даних іншим кольором."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "Дані OSM"
@@ -12717,7 +12820,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "Шар для проведення вимірювань"
+msgstr "Система вимірювання"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -13343,5 +13445,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
-msgstr "Більш детальна інформація про цю функцію"
+msgstr "Більш детальна інформація про цей елемент"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:526
@@ -13440,21 +13542,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Search preset"
-msgstr ""
+msgstr "Заготовка пошуку"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr ""
+msgstr "Показати вікно із заготовками пошуку"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
 msgid "Search presets"
-msgstr ""
+msgstr "Заготовки пошуку"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
 msgid "Show only applicable to selection"
-msgstr ""
+msgstr "Показати тільки ті, що застосовуються для виділеного"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
 msgid "Search in tags"
-msgstr ""
+msgstr "Шукати в теґах"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -13647,5 +13749,5 @@
 msgstr "Розбір відповіді від сервера…"
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14226,5 +14328,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
 msgid "OSM Server Files"
-msgstr "Файли серверу OSM"
+msgstr "Файли сервера OSM"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:89
@@ -15394,5 +15496,5 @@
 "об’єкт.<br><br>Повідомлення про помилку:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15423,5 +15525,5 @@
 "проблемою налаштувань. JOSM не буде працювати."
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -15687,5 +15789,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "Вставка адрес"
@@ -16226,5 +16328,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "Будівлі"
@@ -16415,5 +16517,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Use \"Tableau d''assemblage\""
-msgstr ""
+msgstr "Використовувати «Диаграму збірки»"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
@@ -16478,5 +16580,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -16730,5 +16832,5 @@
 msgid ""
 "Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."
-msgstr ""
+msgstr "Додати «Діаграму збірки» в перелік кадастрових листів для захвату."
 
 #. the crosspiece display
@@ -17169,22 +17271,22 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
 msgid "Download along..."
-msgstr ""
+msgstr "Завантаження вздовж…"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
 msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "Завантаження даних OSM вздовж виділеної лінії."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
 msgid "Download Along"
-msgstr ""
+msgstr "Завантажити вздовж"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
 msgid "Please select 1 or more ways to download along"
-msgstr ""
+msgstr "Будь ласка, виділіть 1 чи більше ліній для завантаження вздовж них"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
 #, java-format
 msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "{0} - кількість проміжних точок для завантаження."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
@@ -18503,7 +18605,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "Об’єднана версія"
+msgstr "отримувати версію протоколу"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18576,4 +18677,6 @@
 "web sites to detect a running JOSM."
 msgstr ""
+"До Remote Control надійшов запит про версію протоколу. Це дозволить веб "
+"сайтам визначити, чи запущено JOSM/"
 
 #: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:25
@@ -19136,13 +19239,13 @@
 msgstr "Ряд будинків по вулиці"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "Сиволи елементів SeaMap"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "Розділювач"
+msgstr "Редактор Seamark"
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -20264,25 +20367,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
 msgid "Mixed type duplicated nodes"
-msgstr ""
+msgstr "Змішаний тип точок, що дублюються"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
 msgid "Highway duplicated nodes"
-msgstr ""
+msgstr "Дорожні точки, що дублюються"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
 msgid "Railway duplicated nodes"
-msgstr ""
+msgstr "Точки залізниці, що дублюються"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
 msgid "Waterway duplicated nodes"
-msgstr ""
+msgstr "Точки водойм, що дублюються"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
 msgid "Boundary duplicated nodes"
-msgstr ""
+msgstr "Точки кордону, що дублюються"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
 msgid "Power duplicated nodes"
-msgstr ""
+msgstr "Точки ліній електромереж, що дублюються"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -20321,5 +20424,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "Мультиполігон"
@@ -21589,5 +21692,5 @@
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr ""
+msgstr "пов’язана вулиця"
 
 #. relation type
@@ -21601,5 +21704,5 @@
 msgctxt "Relation type"
 msgid "enforcement"
-msgstr ""
+msgstr "регулювання руху"
 
 #. relation type
@@ -21607,5 +21710,5 @@
 msgctxt "Relation type"
 msgid "line"
-msgstr ""
+msgstr "лінія"
 
 #. relation type
@@ -21625,5 +21728,5 @@
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr ""
+msgstr "громадський транспорт"
 
 #. relation type
@@ -21631,5 +21734,5 @@
 msgctxt "Relation type"
 msgid "restriction"
-msgstr ""
+msgstr "обмеження"
 
 #. relation type
@@ -21932,5 +22035,5 @@
 #: build/trans_plugins.java:20
 msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "Завантаження даних OSM вздовж лінії"
 
 #. Plugin Duplicate-Way
@@ -22167,5 +22270,5 @@
 #: build/trans_plugins.java:88
 msgid "Create and edit seamarks for OpenSeaMap"
-msgstr ""
+msgstr "Для створення та редагування навігаційних знаків для OpenSeaMap"
 
 #. Plugin touchscreenhelper
@@ -22384,5 +22487,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "Позначення"
@@ -22921,5 +23024,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "метал"
@@ -22932,5 +23035,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "ліс"
@@ -23208,4 +23311,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -23234,9 +23399,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "так"
@@ -23346,9 +23542,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "ні"
@@ -23772,5 +23999,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "пішохідна екскурсія"
@@ -23805,5 +24032,5 @@
 msgstr "добра"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "середня"
@@ -23817,5 +24044,13 @@
 msgstr "жахлива"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "Інвалідним візком"
@@ -23944,4 +24179,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -23973,14 +24216,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "Оператор"
@@ -24242,12 +24489,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "Висота над рівнем моря"
@@ -25099,5 +25346,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "Напруга"
@@ -25409,6 +25656,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -25460,32 +25709,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "Години роботи"
@@ -25494,4 +25743,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -25544,174 +25794,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "Цілодобово"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Пн-Пт 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "Вт-Сб 08:00-15:00; Нд 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr "З кіоском"
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "Види палива:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "Дизельне"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "Біодизель"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Дизельне (зріджений газ — супер-дизель)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Дизельне для вантажівок"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "бензин (91)"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "бензин (95)"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "бензин (98)"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "бензин (100)"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% суміш етанолу)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% суміш етанолу)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "пропан-бутан"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "метан"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr "паливна суміш 1/25 (для мопедів)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr "паливна суміш 1/50 (для мопедів)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr "З кіоском"
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -25741,7 +25992,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr "Номер"
@@ -25757,5 +26008,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "підземна"
@@ -25768,6 +26019,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "Платна"
@@ -25943,5 +26194,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "В інвалідних візках"
@@ -25978,6 +26229,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr "Навіс"
@@ -25985,5 +26236,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "Лавка"
@@ -26102,5 +26353,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "Сигнальний вогонь"
@@ -26160,11 +26411,241 @@
 msgstr "Властивості Готелю"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "Зірки"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr "Інтернет доступ"
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr "бездротовий"
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr "по проводах"
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "термінал"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr "Плата за інтернет доступ"
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr "Місця для паління"
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr "тільки для курців"
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr "роздільно"
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr "ізольовано"
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "Номер телефону"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr "Номер факсу"
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr "Веб-сайт"
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr "Адреса ел. пошти"
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "Мотель"
@@ -26172,20 +26653,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "Властивості Мотелю"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr "Гостьовий будинок"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr "Властивості Гостьового будинку"
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "Дача/Шале"
@@ -26193,10 +26674,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "Властивості Дачі/Шале"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "Хостел/Туристичний табір"
@@ -26204,30 +26685,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "Праивти хостел/туристичний табір"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "Гірський притулок"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "Властивості Гірського притулку"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr "Стоянка фургонів"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr "Властивості Стоянки фургонів"
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "Кемпінг"
@@ -26235,10 +26716,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "Властивості Кемпінгу"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "Харчування"
@@ -26249,5 +26730,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -26255,11 +26736,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "Властивості Ресторану"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "Кухня"
@@ -26267,78 +26748,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "італійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "китайська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "піца"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "бутерброди"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "грецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "німецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "індійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "місцева"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr "кебаб/шашлик"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "турецька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "азійська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "тайська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "мексиканська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "японська"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "французька"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "сандвічі"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "суші"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
-msgstr ""
-
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+msgstr "Міні-пивоварня"
+
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "Швидке харчування"
@@ -26346,17 +26828,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "Властивості Пунктів швидкого харчування"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "риба і чіпси"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "курятина"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr "Відкритий майданчик (кафе)"
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr "Властивості Відкритого майданчику (кафе)"
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "Кафе"
@@ -26364,9 +26858,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "Властивості Кафе"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "Шинок"
@@ -26374,19 +26869,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "Властивості Шинка"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr "Пивний сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr "Властивості Пивного саду"
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "Бар"
@@ -26394,9 +26890,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "Властивості Бару"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "Нічний клуб"
@@ -26404,24 +26901,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "Властивості Нічного клубу"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "Атракціони"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "Властивості Атракціонів"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "Музей"
@@ -26429,9 +26927,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "Властивості Музею"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -26440,9 +26938,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "Властивості Зоопарку"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "Оглядовий майданчик"
@@ -26450,24 +26948,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "Властивості Оглядового майданчику"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr "Оглядова вежа"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "Парк розваг"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "Властивості Парку розваг"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "Витвори мистецтв"
@@ -26475,5 +26973,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "Властивості Витворів мистецтв"
@@ -26481,19 +26979,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "Інформаційне бюро"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "Мапа"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr "Тип мапи"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr "топографічна"
@@ -26531,5 +27029,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -26537,28 +27035,28 @@
 msgstr "мапа вулиць"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr "план-схема"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr "Територія"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr "місцевість"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "місто"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr "область"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr "Детальний опис"
@@ -26568,5 +27066,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr "Маршрути на мапі:"
@@ -26574,5 +27072,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "піші"
@@ -26580,6 +27078,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "Велоспорт"
@@ -26587,5 +27085,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr "для гірського велосипеду"
@@ -26593,6 +27091,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "Лижі"
@@ -26600,5 +27098,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr "кінні"
@@ -26606,54 +27104,53 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr "…інші можливі способи пересування"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "Інформаційна дошка"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr "Вміст покажчика"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr "повідомлення"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "історична довідка"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "жива природа"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "рослини"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "Вказівний стовп"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
-#, fuzzy
+#: build/trans_presets.java:1962
 msgid "Flagpole"
-msgstr "стовп"
+msgstr "Флагшток"
 
 #. item "Tourism/Flagpole"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr "Інформаційний термінал"
@@ -26661,29 +27158,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr "Детальний опис"
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr "Аудіогід"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr "Аудіогід за допомогою мобільного телефону?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "Номер телефону"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "Інші інформаційні пункти"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "Властивості Навісу"
@@ -26691,25 +27188,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "Вогнище"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "Місце для пікніка"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "Властивості Місця для пікніка"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "Історичні місця"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "За́мок"
@@ -26718,19 +27215,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "Властивості Замку"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "Руїни"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "Властивості Руїн"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "Археологічні пам’ятки"
@@ -26739,9 +27236,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "Властивості Археологічних пам’яток"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "Поле бою"
@@ -26749,10 +27246,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "Властивості Поля бою"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "Палеонтологічні пам’ятки"
@@ -26760,5 +27257,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "Властивості Палеонтологічних пам’яток"
@@ -26766,15 +27263,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "Властивості Монументу"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "Пам’ятник"
@@ -26782,55 +27279,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "Властивості Пам’ятнику"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr "Придорожній Хрест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr "Властивості Придорожнього Хреста"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr "Придорожня Рака"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr "Властивості Придорожньої Раки"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "Прикордонний камінь"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "Властивості Прикордонного каменя"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "Дозвілля"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "Властивості Аквапарку"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "Ігровий майданчик"
@@ -26838,35 +27335,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "Властивості Ігрового майданчику"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "Рибалка"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "Властивості місця для рибалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "Спортивні споруди"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "Стадіон"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "Властивості Стадіону"
@@ -26880,6 +27377,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "види спорту:"
@@ -27295,6 +27792,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -27329,240 +27826,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "багатоборство"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "стрільба з лука"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "американський футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "австралійський футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr "боче (петанк)"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "канадський футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "каное"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "скелелазіння"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr "тренувальні сітки для крикету"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "собачі перегони"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "кінний спорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr "гаельський футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "гімнастика"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "кінські перегони"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "мотоспорт"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr "ракетбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr "ліга регбі"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr "союз регбі"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "стрільба"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "катання на ковзанах"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "катання на лижах"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "плавання"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "настільний теніс"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "теніс"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "Спортивний центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "Властивості Спортивного центру"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "Спортивний майданчик"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "Властивості Спортивного майданчику"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "Бігова доріжка"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "Властивості Бігової доріжки"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "Поле для гольфу"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "Властивості Поля для гольфу"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "Міні-гольф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "Властивості Поля для міні-гольфу"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "Багатоборство"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "Правити Багатоборство"
@@ -27604,23 +28101,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "тип"
@@ -27662,211 +28159,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr "спортивний майданчик"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "спортивний центр"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "стадіон"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr "бігова доріжка"
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr "Боулінг (10-кегельний)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr "Властивості Боулінгу"
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "Властивості Атлетики"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "Стрільба з лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "Властивості Стрільби з лука"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "Скелелазіння"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "Властивості Скелелазіння"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "Веслування"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "Властивості Каное"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "Властивості Велоспорту"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "Собачі перегони"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "Властивості Собачих перегонів"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "Кінний спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "Властивості Кінного спорту"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "Кінні перегони"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "Властивості Кінських перегонів"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "Гімнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "Властивості Гімнастики"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "Мотоспорт"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "Властивості Мотоспорту"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "Катання на ковзанах"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "Властивості Катання на ковзанах"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "Властивості Скейтбордингу"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "Плавання"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "Властивості Плавання"
@@ -27874,52 +28371,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "Властивості Катання на лижах"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr "Тип лижні"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr "гірські лижі"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr "бігові лижі"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr "сніговий парк"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "Складність"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "початковий рівень"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "легкий рівень"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "складний рівень"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "для професіоналів"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr "фрірайд"
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "Стрільба"
@@ -27927,204 +28424,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "Властивості Стрільби"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "Спорт (з м’ячем)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "Властивості Футболу"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "Австралійський футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "Властивості Австралійського футболу"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
 msgstr "Американський футбол"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
 msgstr "Властивості Американського футболу"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
 msgstr "Канадський футбол"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
 msgstr "Властивості Канадського футболу"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr "Гаельський футбол"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr "Властивості Гаельського футболу"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr "Ліга регбі"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr "Властивості Ліги регбі"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr "Союз регбі"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr "Властивості Союзу регбі"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "Властивості Бейсболу"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "Властивості Бейсболу"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "Властивості Гольфу"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "поле для гольфу"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr "Боче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr "Властивості боче"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "Властивості Боулз"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr "Властивості Крикету"
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr "Тренувальні сітки для крикету"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr "Властивості Тренувальних сіток для крикету"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "Властивості Крокету"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "Властивості Хокею"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "Властивості Пелоти"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr "Властивості Ракетболу"
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "Настільний теніс"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "Властивості Настільного тенісу"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "Теніс"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "Властивості Тенісу"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "Штучного походження"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "Будівля"
@@ -28132,5 +28629,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "Громадські будівлі"
@@ -28138,10 +28635,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "Властивості Громадської будівлі"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "Міська державна адміністрація"
@@ -28149,10 +28646,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "Властивості Міської державної адміністрації"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "Амбасада"
@@ -28160,10 +28657,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "Властивості Амбасади"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "Суд"
@@ -28172,10 +28669,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "Властивості Суду"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "В’язниця"
@@ -28184,10 +28681,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "Властивості В’язниці"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "Поліція/міліція"
@@ -28197,10 +28694,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "Властивості Поліції/міліції"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "Пожежна станція"
@@ -28209,10 +28706,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "Властивості Пожежного депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "Пошта"
@@ -28220,5 +28717,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "Властивості Пошти"
@@ -28226,15 +28723,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "Дитячий садок"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "Властивості Дитячого саду"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "Школа"
@@ -28242,10 +28739,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "Властивості Школи"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "Університет"
@@ -28253,10 +28750,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "Властивості Університету"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "Коледж"
@@ -28264,5 +28761,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "Властивості коледжу"
@@ -28270,5 +28767,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "Кіно"
@@ -28277,10 +28774,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "Властивості Кінотеатру"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "Бібліотека"
@@ -28289,9 +28786,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "Властивості Бібліотеки"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "Центр мистецтв"
@@ -28299,10 +28796,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "Властивості Центру мистецтв"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "Театр"
@@ -28311,10 +28808,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "Властивості Театру"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "Культове місце"
@@ -28324,5 +28821,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "Властивості Культового місця"
@@ -28331,6 +28828,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "Релігія"
@@ -28339,66 +28836,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "бахаі"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "буддизм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "християнство"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "індуїзм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "джайнізм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "іудаїзм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "іслам"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "сикхізм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr "спіритуалізм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "даосизм"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr "уніатство"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "Віросповідання"
@@ -28407,81 +28904,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "англіканська"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "баптизм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "католицизм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "євангелізм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr "свідки ієгови"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "лютеранство"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "методизм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "мормонство"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "православ’я"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "п’ятидесятники"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "пресвітеріанство"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "протестантизм"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "квакери"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "шиїти"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "суніти"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "Адреси"
@@ -28490,5 +28987,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "Властивості Адреси"
@@ -28496,5 +28993,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "Номер будинку"
@@ -28502,25 +28999,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "Назва будинку"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "Вулиця"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "Назва міста"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "Поштовий індекс"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "Код країни"
@@ -28529,5 +29026,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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
 msgstr "Властивості Вставки адрес"
@@ -28535,61 +29032,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "Схема нумерації"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "непарні"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "парні"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "за абеткою"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "Штучні об’єкти"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "Заводи"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "Властивості Заводів"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "Башта"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "Властивості Башти"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "Тип Башти"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "зв’язку"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "спостереження"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "Висота (в метрах)"
@@ -28597,25 +29094,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "Водонапірна вежа"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "Властивості Водонапірної вежі"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "Властивості Газгольдера"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -28623,10 +29120,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "Властивості Маяка"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "Вітряк"
@@ -28634,10 +29131,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "Властивості Вітряка"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "Трубопровід"
@@ -28646,41 +29143,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "Властивості Трубопроводу"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr "тепло"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr "нафта"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr "каналізація"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr "іншого призначення"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "Розташування"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr "підводне"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr "надземне"
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "Очисні споруди"
@@ -28690,10 +29187,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "Властивості Очисних споруд"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "Кран"
@@ -28701,5 +29198,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "Властивості Крану"
@@ -28707,10 +29204,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr "Властивості Сигнального вогню"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "Геодезичний пункт"
@@ -28718,10 +29215,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "Властивості Геодезичного пункту"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "Камера спостереження"
@@ -28729,23 +29226,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "Властивості Камери спостереження"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr "внутрішня"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "зовнішня"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr "загальнодоступне"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "Електростанція"
@@ -28755,35 +29252,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "Властивості Електростанції"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "вітряна"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "гідро"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "теплова"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "вугільна"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "сонячна"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "Електропідстанція"
@@ -28792,10 +29289,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "Властивості Електропідстанції"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr "Трансформаторна будка"
@@ -28804,5 +29301,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr "Властивості Трансформаторної будки"
@@ -28810,10 +29307,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr "назва (номер) мережі"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "Опора ЛЕП"
@@ -28824,23 +29321,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "Властивості Опори ЛЕП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr "опора"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr "стовп"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr "Номер опори"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "Лінія електропередач"
@@ -28849,20 +29346,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "Властивості Лінії електропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr "Тип лінії"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2458
+msgstr "електромережа"
+
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -28870,55 +29367,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
 msgstr "Кількість кабелів"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Кількість проводів (краще: провідників) на кабель"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
 msgstr "один провід"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "double"
 msgstr "два проводи"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "triple"
 msgstr "три проводи"
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr "чотири проводи"
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "Зручності"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "Туалет"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr "обмежений"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr "Примітка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "Поштова скринька"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "Телефон"
@@ -28927,5 +29424,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "Властивості телефону"
@@ -28933,5 +29430,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "Монети"
@@ -28939,5 +29436,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr "Банкноти"
@@ -28945,5 +29442,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "Електронні гаманці та платіжні картки"
@@ -28951,5 +29448,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr "Дебетові картки"
@@ -28957,15 +29454,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "Кредитні картки"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "Телефонні картки"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "Пункт прийому вторинної сировини"
@@ -28974,5 +29471,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "Властивості Пункту прийому вторинної сировини"
@@ -28980,35 +29477,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "Батарейки/Акумулятори"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "Бляшанки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "Одяг/Дрантя"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "Скло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "Папір"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "Металобрухт"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr "Урна для сміття"
@@ -29016,5 +29513,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr "Властивості Урни для сміття"
@@ -29023,31 +29520,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr "Спинка"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "Матеріал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "камінь"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "Колір"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "чорний"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "коричневий"
@@ -29126,5 +29623,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -29134,31 +29631,31 @@
 msgstr "зелений"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "червоний"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "синій"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "сірий"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "білий"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "Кількість місць"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr "Мисливська вежа"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr "Властивості Мисливської вежі"
@@ -29167,30 +29664,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "Висота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "низька"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "половинна"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "повна"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "Прихована"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "Зачиняється"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "Фонтан"
@@ -29199,10 +29696,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "Властивості Фонтану"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "Питна вода"
@@ -29211,10 +29708,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "Властивості Питної води"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "Пожежний гідрант"
@@ -29223,5 +29720,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "Властивості Пожежного гідранту"
@@ -29229,5 +29726,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "Вікно для покинутих немовлят"
@@ -29235,15 +29732,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "Властивості Вікна для покинутих немовлят"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "Автомобільний дилер"
@@ -29251,10 +29748,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "Властивості Автомобільного дилера"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "Веломагазин"
@@ -29263,28 +29760,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "Властивості Веломагазина"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "Властивості Супермаркету"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr "Побутова хімія"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr "Властивості Магазину побутової хімії"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "Міні-маркет"
@@ -29292,9 +29789,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "Властивості Міні-маркету"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr "Кіоск"
@@ -29302,27 +29799,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr "Властивості Кіоску"
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "Книжковий магазин"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "Властивості Книжкового магазину"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "Турагентство"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "Властивості Турагентства"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "М’ясна лавка"
@@ -29330,9 +29827,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "Властивості М’ясної лавки"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "Булочна"
@@ -29340,9 +29837,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "Властивості Булочної"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "Квітковий магазин"
@@ -29350,18 +29847,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "Властивості Квіткового магазину"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "Екологічно чисті продукти"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "Властивості Магазину екологічно чистих проуктів"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "Алкогольні напої"
@@ -29369,54 +29866,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "Властивості Магазину алкогольних напоїв"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "Напої"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "Властивості Магазину напоїв"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "Комп’ютери"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "Властивості Комп’ютерної крамниці"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "Електроніка"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "Властивості Магазину побутової електроніки"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Аудіо апаратура"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "Властивості Магазину Аудіо апаратури"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "Меблі"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "Властивості Меблевого магазину"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "Садово-парковий центр"
@@ -29424,9 +29921,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "Властивості Магазину садово-паркових товарів"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "Господарські товари"
@@ -29434,9 +29931,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "Властивості Магазину господарських товарів"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "Зроби сам"
@@ -29444,54 +29941,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "Властивості Магазину «Зроби сам»"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "Канцтовари"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "Властивості Магазину канцтоварів"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "Перукарня"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "Властивості Перукарні"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "Взуття"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "Властивості Магазину взуття"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "Іграшки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "Властивості Магазину іграшок"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "Відео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "Властивості Магазину відео"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "Хімчистка"
@@ -29499,9 +29996,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "Властивості Хімчистки"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "Пральня"
@@ -29509,9 +30006,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "Властивості Пральні"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "Товари для активного відпочинку"
@@ -29519,24 +30016,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "Властивості Магазину товарів для активного відпочинку"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "Властивості Магазину спорт-товарів"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "Властивості Магазину оптики"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "Торговий автомат"
@@ -29544,5 +30041,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "Властивості Торгового автомата"
@@ -29550,97 +30047,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "Товар"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr "квитки на громадський транспорт"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr "схеми громадського транспорту"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr "талони на паркування"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "продукти харчування"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "напої"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "солодощі"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "сигарети"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "фотографії"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "їжа для тварин"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "газети"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "іграшки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr "телефонні картки"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr "вело шини"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr "пакети для екскрементів"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr "накопичувальні, дисконтні карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "Гроші"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "Банк"
@@ -29648,14 +30145,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "Властивості Банку"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "Обмін валют"
@@ -29663,5 +30160,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "Властивості Пункту обміну валют"
@@ -29669,15 +30166,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "Властивості Банкомату"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "Медицина"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "Лікар"
@@ -29685,18 +30182,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "Властивості Лікаря"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "Стоматологія"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "Властивості Стоматології"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -29704,5 +30201,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "Властивості Аптеки"
@@ -29710,9 +30207,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "За рецептом"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "Лікарня"
@@ -29720,10 +30217,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "Властивості Лікарні"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "Пункт швидкої допомоги"
@@ -29732,5 +30229,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "Властивості Пункту швидкої допомоги"
@@ -29739,20 +30236,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr "Номер пункту"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr "Назва пункту"
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "Номер телефону"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Використовуйте міжнародний код, наприклад: +38-044-1030000)"
@@ -29760,5 +30252,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -29767,64 +30259,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "Властивості Ветеренарного пункту"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "Географія"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "Місця"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "Властивості Континенту"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "Країна"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "Властивості Країни"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "Штат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "Властивості Штату"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "Область"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "Властивості Області"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "Район"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "Властивості Району"
@@ -29832,15 +30324,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "Місто (понад 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "Властивості Міста"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "Місто"
@@ -29848,10 +30340,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "Властивості Селища"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "Передмістя"
@@ -29859,25 +30351,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "Властивості Передмістя"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "Властивості Села"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "Хутір"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "Властивості Хутора"
@@ -29885,5 +30377,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr "Місцевість"
@@ -29891,10 +30383,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr "Властивості Місцевості"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "Острів"
@@ -29902,10 +30394,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "Властивості Острова"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr "Острівець"
@@ -29913,5 +30405,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr "Властивості Острівця"
@@ -29919,5 +30411,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "Вхід до печери"
@@ -29925,10 +30417,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "Властивості Входу до печери"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "Вершина"
@@ -29936,10 +30428,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "Властивості Вершини"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "Льодовик"
@@ -29947,10 +30439,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "Властивості Льодовика"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "Вулкан"
@@ -29958,70 +30450,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "Властивості Вулкану"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "Кордони"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "Державний"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "Властивості Державного кордону"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "Адміністративний"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "Властивості Адміністративного кордону"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "Громад"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "Властивості Меж громад"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "Політичні"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "Властивості політичного кордону"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "Національний парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "Властивості Кордону національного парку"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "Землекористування"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "Дерево"
@@ -30030,15 +30522,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "Властивості Дерева"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "Ботанічна назва"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr "Ліс"
@@ -30047,5 +30539,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr "Властивості Лісу"
@@ -30053,17 +30545,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "хвойний"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "листяний"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "мішаний"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "Лісовий масив"
@@ -30072,14 +30564,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "Властивості Лісового масиву"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "Заповідник"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "Властивості Заповідника"
@@ -30087,25 +30579,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr "Осип"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr "Властивості Осипи"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr "Чагарник"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr "Властивості Чагарнику"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr "Кам’яниста земля"
@@ -30113,10 +30605,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr "Властивості Кам’янистої землі"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr "Пустир"
@@ -30124,5 +30616,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr "Властивості Пустиря"
@@ -30130,5 +30622,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr "Двір ферми"
@@ -30137,45 +30629,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr "Властивості Двору ферми"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "Сільськогосподарські угіддя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "Властивості Сільськогосподарських угідь"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "Левада"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "Властивості Левади"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr "Властивості Виноградників"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr "Горо́д"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr "Властивості Го́родів"
@@ -30183,25 +30675,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "Сад"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "Властивості Садів"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr "Властивості Газону"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr "Сільський майдан"
@@ -30209,10 +30701,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr "Властивості Сільського майдану"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr "Землі місцевої громади"
@@ -30220,20 +30712,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr "Властивості Земель місцевої громади"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "Властивості Парку"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "Майданчик для ігор"
@@ -30241,5 +30733,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "Властивості Майданчику для ігор"
@@ -30247,15 +30739,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "Житлова зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "Властивості Житлової зони"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "Цвинтар"
@@ -30263,9 +30755,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "Властивості Цвинтаря"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "Кладовище"
@@ -30273,39 +30765,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "Властивості Кладовища"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "Роздрібна торгівля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "Властивості Зони роздрібної торгівлі"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "Діловий район"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "Властивості Ділового району"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "Промзона"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "Властивості Промзони"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "Територія залізниці"
@@ -30313,15 +30805,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "Властивості Території залізниці"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "Військова зона"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "Властивості Військової зони"
@@ -30329,50 +30821,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "Будівельний майданчик"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "Властивості Будівельного майданчику"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr "Очищене місце під забудову"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr "Властивості Очищеного місця під забудову"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "Ділянка під нову забудову"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "Властивості Ділянки під нову забудову"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "Звалище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "Властивості Звалища"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "Кар’єр"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "Властивості Кар’єра"
@@ -30382,5 +30874,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "Властивості Мультиполігону"
@@ -30392,5 +30884,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "зовнішній сегмент"
@@ -30398,5 +30890,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "внутрішній сегмент"
@@ -30404,5 +30896,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "Кордони"
@@ -30413,5 +30905,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "Властивості Кордонів"
@@ -30419,36 +30911,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "Тип Кордону"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "адміністративний"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "національний"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "громади"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "політичний"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "Адміністративний рівень"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "Підпорядкована територія"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "Адміністративний центр"
@@ -30456,5 +30948,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "Обмеження на поворот"
@@ -30463,5 +30955,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "Властивості Обмеження на поворот"
@@ -30469,34 +30961,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "Обмеження"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "поворот ліворуч заборонений"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "поворот праворуч заборонений"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "проїзд заборонений"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "розворот заборонений"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "тільки праворуч"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "тільки ліворуч"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "тільки прямо"
@@ -30505,15 +30997,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "з"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "через точку або лінію"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "до"
@@ -30521,5 +31013,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "Маршрут"
@@ -30528,5 +31020,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "Властивості маршруту"
@@ -30534,5 +31026,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "Тип маршруту"
@@ -30640,5 +31132,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -30649,17 +31141,17 @@
 msgstr "велосипедний"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "автобусний"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "дорога"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "поромний"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "лижний"
@@ -30727,5 +31219,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -30735,9 +31227,9 @@
 msgstr "піший"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "трамвайний"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr "об’їзд"
@@ -30751,10 +31243,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr "Опис символів"
@@ -30762,31 +31254,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "Мережа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr "Стан маршруту"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr "планований"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr "альтернативний"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr "тимчасовий"
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "з’єднуючий"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "Колір (hex)"
@@ -30795,30 +31287,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr "відрізок маршруту"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr "наступний відрізок"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr "попередній відрізок"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr "кінцева точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr "наступна кінцева точка"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr "попередня кінцева точка"
@@ -31996,16 +32488,4 @@
 msgstr "авіатраса"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "термінал"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -34924,4 +35404,22 @@
 msgstr "Італія – Сицилія"
 
+#~ msgid "8/d"
+#~ msgstr "8 годин на добу"
+
+#~ msgid "Error: {0}"
+#~ msgstr "Помилка: {0}"
+
+#~ msgid "Warning: {0}"
+#~ msgstr "Попередження: {0}"
+
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "Градуси у Хвилинах Секундах"
+
+#~ msgid "Style for inner way ''{0}'' equals multipolygon."
+#~ msgstr "Стиль внутрішньої лінії \"{0}\" такий же, як у мультиполігону."
+
+#~ msgid "Style for outer way ''{0}'' mismatches."
+#~ msgstr "Стиль зовнішньої лінії \"{0}\" не узгоджений."
+
 #~ msgid "The selected way does not contain the selected node."
 #~ msgid_plural "The selected way does not contain all the selected nodes."
@@ -34929,28 +35427,4 @@
 #~ msgstr[1] "Виділена лінія не містить виділених точок"
 #~ msgstr[2] "Виділена лінія не містить всіх виділених точок"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "Градуси у Хвилинах Секундах"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr ""
-#~ "Введіть коментар для даних, що надсилаються на сервер (мін. 3 знаки)"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr ""
-#~ "Будь ласка, введіть коментар для надсилання на сервер цього набору змін "
-#~ "(мін. 3 символи)"
-
-#~ msgid "Error: {0}"
-#~ msgstr "Помилка: {0}"
-
-#~ msgid "Warning: {0}"
-#~ msgstr "Попередження: {0}"
-
-#~ msgid "Style for inner way ''{0}'' equals multipolygon."
-#~ msgstr "Стиль внутрішньої лінії \"{0}\" такий же, як у мультиполігону."
-
-#~ msgid "Style for outer way ''{0}'' mismatches."
-#~ msgstr "Стиль зовнішньої лінії \"{0}\" не узгоджений."
 
 #~ msgid ""
@@ -34976,4 +35450,7 @@
 #~ msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 #~ msgstr "Помилка синтаксису шаблону: Шаблон {0} в {1} неприпустимий!"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "Відсутній результат об’єднання для об’єкта з ідентифікатором {0}"
 
 #~ msgid ""
@@ -35110,6 +35587,15 @@
 #~ msgstr "Застосувати також для нащадків"
 
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr ""
+#~ "Введіть коментар для даних, що надсилаються на сервер (мін. 3 знаки)"
+
 #~ msgid "GPS point"
 #~ msgstr "точка GPS"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr ""
+#~ "Будь ласка, введіть коментар для надсилання на сервер цього набору змін "
+#~ "(мін. 3 символи)"
 
 #~ msgid "Uploading {0} objects ..."
Index: applications/editors/josm/i18n/po/zh_CN.po
===================================================================
--- applications/editors/josm/i18n/po/zh_CN.po	(revision 22626)
+++ applications/editors/josm/i18n/po/zh_CN.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-08-04 03:46+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-13 09:18+0000\n"
 "Last-Translator: mmyfl <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:56+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -25,6 +25,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -120,6 +120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -204,6 +204,6 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
-"警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 使用者的个人页面可能会失"
-"败。API 基础 URL为: ''{0}''"
+"警告：不是期望中的 API 基础 URL 格式。重定向至 OSM 用户的个人页面可能会失败。"
+"API 基础 URL为: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
@@ -228,4 +228,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -237,4 +238,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -244,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -299,5 +301,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "取消"
@@ -363,4 +365,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -419,5 +422,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -541,5 +544,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:384
 msgid "Close open changesets"
-msgstr "关闭开的放更改组合"
+msgstr "关闭开放的更改组合"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36
@@ -1365,5 +1368,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1428,4 +1431,53 @@
 msgid "Preferences"
 msgstr "首选项"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "测量员..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "汉堡"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "设定插件网站"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "加入至选择区域"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1467,4 +1519,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1698,4 +1751,5 @@
 msgstr "请选择至少一条路径来简化。"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1703,4 +1757,5 @@
 #: ../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 "是"
@@ -1747,8 +1802,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "不能在选取的节点上切割路径。"
+msgstr "当前的选择不能用于切割 - 没有节点被选中。"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -1885,5 +1939,5 @@
 #, java-format
 msgid "Dupe into {0} nodes"
-msgstr ""
+msgstr "分离为 {0} 个节点"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
@@ -1891,6 +1945,5 @@
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "将 {0} 个节点分离为 {1} 个节点"
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -2463,6 +2516,6 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
-"以拖曳移动对象；按Shift 加入选择区域(Ctrl 可切换)；Shift-Ctrl 会旋转选取的；"
-"或改变选择区域"
+"拖曳可移动对象;按Shift 加入选择区域(Ctrl 可切换);Shift-Ctrl 可旋转选取;或改变"
+"选择区域"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
@@ -2480,5 +2533,5 @@
 "move zoom with right button"
 msgstr ""
-"拖曳或Ctrl+. 或Ctrl+, 来缩放；Ctrl+up, left, down, right 可移动；按右键可移动"
+"拖曳或Ctrl+. 或Ctrl+, 来缩放;Ctrl+up, left, down, right 可移动；按右键可移动"
 "缩放"
 
@@ -2623,9 +2676,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>使用者：</b>... - 所有由某使用者改变的对象"
+msgstr "<b>用户：</b>... - 所有由某用户改变的对象"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr "<b>user:anonymous</b> - 所有对象是由匿名使用者所改变的"
+msgstr "<b>user:anonymous</b> - 所有对象是由匿名用户所改变的"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
@@ -2924,4 +2977,5 @@
 
 #. 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
@@ -2951,5 +3005,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "确定"
@@ -3039,5 +3093,5 @@
 #, java-format
 msgid "Change relation member role for {0} {1}"
-msgstr ""
+msgstr "改变关系成员 {0} {1} 的角色"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30
@@ -3156,7 +3210,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "您即将删除不完整的对象。<br>这样会造成问题，因为您没有看到实际的对象。<br>您"
@@ -3189,10 +3244,5 @@
 msgstr[0] "移动 {0} 个节点"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "清理的对象 \"{0}\""
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3200,4 +3250,10 @@
 msgid_plural "Purged {0} objects"
 msgstr[0] "已清除 {0} 个对象"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "清理的对象 \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
@@ -3538,5 +3594,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "deg° min'' sec\""
-msgstr ""
+msgstr "度° 分\" 秒\""
 
 #. *
@@ -3545,5 +3601,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "deg° min'' (Nautical)"
-msgstr ""
+msgstr "度° 分\" (航海)"
 
 #. *
@@ -3580,5 +3636,5 @@
 msgstr "无法将原型 {0} 加入数据组合，因为它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3587,9 +3643,9 @@
 "error, it should be safe to continue in your work."
 msgstr ""
-"JOSM 预期在数据组合中会找到原型 [{0} {1}] 但却没有。请在http://josm."
+"JOSM 预期在数据组合中会找到原型 [{0} {1}] 但却没有。请在 http://josm."
 "openstreetmap.de 回复这个情况。这不是严重的错误，继续您的工作应是安全的。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3599,10 +3655,12 @@
 msgstr "缺少 id {0} 路径的合并目标"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "缺少 id {0} 对象的合并目标"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr "类型  {0} id {1} 的对象已被标记为删除，但它在资料集中丢失了。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3610,5 +3668,5 @@
 msgstr "缺少 id {0} 节点的合并目标"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3617,5 +3675,5 @@
 msgstr "缺少 id {0} 关系的合并目标"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3624,4 +3682,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "缺少 id {1} 类型 {0} 的合并目标"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -3914,5 +3980,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "铁路"
@@ -4067,5 +4133,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:293
 msgid "Client Time Out"
-msgstr "客户端逾时"
+msgstr "客户端超时"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:309
@@ -4126,5 +4192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
-msgstr "使用者的名称。"
+msgstr "用户的名称。"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
@@ -4174,5 +4240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
-msgstr "使用者名称"
+msgstr "用户名"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
@@ -4181,69 +4247,69 @@
 msgstr "密码"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "选项"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "显示此说明信息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "标准 unix 几何引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "下载此绑定方块"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "于此 url 下载位置(具有 lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "开启文件(任何可以使用文件/开启来开启的文件类型)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "下载绑定方块做为原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "将url (lat=x&lon=y&zoom=z) 的位置下载为原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "选取指定的查找"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "以最大化模式启动"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "重设偏好设定为预设值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "设定语言"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "选项提供为 Java 系统属性"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
-msgstr "改变所有使用者设定值的文件夹"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+msgstr "改变所有用户设定值的文件夹"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4255,9 +4321,9 @@
 "      Java 选项以 MB 来指定分配到内存的最大容量"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "范例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4265,45 +4331,45 @@
 msgstr "参数--download、 --downloadgps 和--selection 会以这个顺序处理。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "如果您使用--selection 请确定已载入某些数据。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "初始化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "正在更新插件..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "正在安装更新的插件"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "载入较早的插件"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "设定预设值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
-msgstr "建立主视窗中"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+msgstr "建立主窗口中"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "正在载入插件"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
 msgstr "未保存的 OSM 数据"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
 msgstr "恢复"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4314,14 +4380,32 @@
 "你想恢复数据吗?"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "偏好设定 {0} 已经被删除，因为它已不再使用了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+"<h2>JOSM 需要 Java 版本 6。<h2>检测到 Java 版本: {0}。<br>你可以<ul><li>升级 "
+"Java (JRE) 或</li><li>使用更早版本 (兼容 Java 5) 的 JOSM。</li></ul>更多信息:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr "退出 JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "文件"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4340,10 +4424,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
-msgstr "检视"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+msgstr "查看"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4351,5 +4435,5 @@
 msgstr "工具"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4357,5 +4441,5 @@
 msgstr "预设组合"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4366,5 +4450,5 @@
 msgstr "菜单：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "音效"
@@ -4449,5 +4533,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
-msgstr "使用者："
+msgstr "用户："
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:389
@@ -4462,17 +4546,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "数字"
+msgstr "公制"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "中式"
+msgstr "中文"
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "商业"
+msgstr "英制"
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5181,5 +5262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "全部"
@@ -5826,5 +5907,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "关系"
@@ -5918,10 +5999,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "在关系清单中选择"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "在关系清单中选择。"
@@ -5973,5 +6054,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
 msgid "Open a list of people working on the selected objects."
-msgstr "开启在编辑选取对象的使用者的清单。"
+msgstr "开启在编辑选取对象的用户的清单。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
@@ -5983,9 +6064,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:160
 msgid "Select primitives submitted by this user"
-msgstr "选择由这个使用者提交的原型"
+msgstr "选择由这个用户提交的原型"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191
 msgid "Launches a browser with information about the user"
-msgstr "启动浏览器显示关于此使用者的信息"
+msgstr "启动浏览器显示关于此用户的信息"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
@@ -5993,5 +6074,5 @@
 msgid ""
 "Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr "警告：只会显示{1} 个已选取使用者的前{0} 位"
+msgstr "警告：只会显示{1} 个已选取用户的前{0} 位"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:226
@@ -6097,6 +6178,6 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
-"<html>JOSM 目前是以匿名使用者执行。它无法从<br> OSM 服务器下载您的更改组合，"
-"除非在 JOSM 偏好设定<br>输入您的 OSM 使用者名称。</html>"
+"<html>JOSM 目前是以匿名用户执行。它无法从<br> OSM 服务器下载您的更改组合，除"
+"非在 JOSM 偏好设定<br>输入您的 OSM 用户名称。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -6136,5 +6217,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
 msgid "User"
-msgstr "使用者"
+msgstr "用户"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
@@ -6520,4 +6601,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6979,5 +7062,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7021,111 +7103,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "名称"
@@ -7157,5 +7240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
 msgid "Remove the changeset in the detail view panel from the local cache"
-msgstr "从本地缓存删除详细数据检视面板中的更改组合"
+msgstr "从本地缓存删除详细数据查看面板中的更改组合"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
@@ -7230,5 +7313,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
-msgstr "选择由指定使用者拥有的更改组合"
+msgstr "选择由指定用户拥有的更改组合"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
@@ -7259,9 +7342,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID:"
-msgstr "使用者 ID："
+msgstr "用户 ID："
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name:"
-msgstr "使用者名称："
+msgstr "用户名称："
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
@@ -7271,9 +7354,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
 msgid "Only changesets owned by the user with the following user ID"
-msgstr "只有由下列使用者ID 拥有的更改组合"
+msgstr "只有由下列用户ID 拥有的更改组合"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
-msgstr "只有由下列使用者名称拥有的更改组合"
+msgstr "只有由下列用户名称拥有的更改组合"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -7281,31 +7364,31 @@
 "Cannot restrict changeset query to the current user because the current user "
 "is anonymous"
-msgstr "不能限制更改组合的查询为目前的使用者，因为目前的使用者是匿名的"
+msgstr "不能限制更改组合的查询为目前的用户，因为目前的用户是匿名的"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID is not valid"
-msgstr "使用者ID 目前的数值 \"{0}\" 是无效的"
+msgstr "用户ID 目前的数值 \"{0}\" 是无效的"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
 #, java-format
 msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr "不能限制更改组合的查询为使用者名称 \"{0}\""
+msgstr "不能限制更改组合的查询为用户名称 \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
-msgstr "请输入有效的使用者 ID"
+msgstr "请输入有效的用户 ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
-msgstr "无效的使用者 ID"
+msgstr "无效的用户 ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
-msgstr "请输入非空白的使用者名称"
+msgstr "请输入非空白的用户名称"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
-msgstr "无效的使用者名称"
+msgstr "无效的用户名称"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
@@ -7373,5 +7456,5 @@
 msgid ""
 "The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr "目前的数值不是有效的使用者 ID。请输入大于 0 的整数值"
+msgstr "目前的数值不是有效的用户 ID。请输入大于 0 的整数值"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
@@ -7379,10 +7462,9 @@
 "<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
-msgstr ""
-"<html>目前的数值不是有效的使用者名称。<br>请输入非空的使用者名称。</html>"
+msgstr "<html>目前的数值不是有效的用户名称。<br>请输入非空的用户名称。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr "请输入非空白的使用者名称"
+msgstr "请输入非空白的用户名称"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
@@ -7435,6 +7517,6 @@
 "user name in the preferences first.</em></html>"
 msgstr ""
-"<html>下载我的开放更改组合<br><em>已停用。请先在偏好设定中输入您的OSM 使用者"
-"名称。</em></html>"
+"<html>下载我的开放更改组合<br><em>已停用。请先在偏好设定中输入您的OSM 用户名"
+"称。</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
@@ -7447,10 +7529,10 @@
 "currently no map view active.</em></html>"
 msgstr ""
-"<html>下载在目前地图检视中的更改组合。<br><em>已停用。目前并没有使用中的地图"
-"检视。</em></html>"
+"<html>下载在目前地图查看中的更改组合。<br><em>已停用。目前并没有使用中的地图"
+"查看。</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
 msgid "<html>Download changesets in the current map view</html>"
-msgstr "<html>下载在目前地图检视中的更改组合</html>"
+msgstr "<html>下载在目前地图查看中的更改组合</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7517,5 +7599,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
 msgid "Determine user id for current user..."
-msgstr "判断目前使用者的 id..."
+msgstr "判断目前用户的 id..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
@@ -8036,5 +8118,5 @@
 "Members from paste buffer cannot be added because they are not included in "
 "current layer"
-msgstr ""
+msgstr "从剪贴板中的成员不能被添加，因为它们被不包括在当前图层"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8184,21 +8266,25 @@
 msgstr "重新命名目前选取的书签"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "最小纬度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "最小经度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "最大纬度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "最大经度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8206,10 +8292,10 @@
 msgstr "www.openstreetmap.org 的 URL (您可以在这里粘贴 URL 下载该区域)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "绑定方块"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8218,15 +8304,15 @@
 msgstr "字串 \"{0}\" 不是一个合格的 double 数值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "纬度的数值范围必须为[-90,90]。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "经度的数值范围必须为[-180,180]。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8375,8 +8461,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "类型"
@@ -8405,6 +8491,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "不明"
@@ -8425,5 +8511,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
-msgstr "JOSM 协助文件浏览器"
+msgstr "JOSM 帮助文件浏览器"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
@@ -8440,5 +8526,5 @@
 "<html><p class=\"warning-header\">缺少帮助主题的内容</p><p class=\"warning-"
 "body\">帮助主题的内容 <strong>{0}</strong> 尚不能取得。不管是您当地语言 "
-"({1}) 或是英语版本都没有。<br><br>请协助改进 JOSM 帮助系统并填好缺少的信息。"
+"({1}) 或是英语版本都没有。<br><br>请帮助改进 JOSM 帮助系统并填好缺少的信息。"
 "您可以编辑<a href=\"{2}\">将帮助主题编辑为当地的语言 ({1})</a> 和 <a href="
 "\"{3}\">英语版本</a>。</p></html>"
@@ -8812,7 +8898,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "不合格的上传注解"
+msgstr "输入一个上传注解"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -8921,9 +9006,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145
 msgid "Save user and password (unencrypted)"
-msgstr "保存使用者与密码(未加密)"
+msgstr "保存用户与密码(未加密)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
 msgid "Please enter the user name of your OSM account"
-msgstr "请输入您 OSM 帐号的使用者名称"
+msgstr "请输入您 OSM 帐号的用户名称"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
@@ -8944,5 +9029,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254
 msgid "Please enter the user name for authenticating at your proxy server"
-msgstr "请输入您的代理服务器验证用的使用者名称"
+msgstr "请输入您的代理服务器验证用的用户名称"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255
@@ -8971,5 +9056,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
 msgid "Authenticate with the supplied username and password"
-msgstr "以指定的使用者名称和密码进行验证"
+msgstr "以指定的用户名称和密码进行验证"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
@@ -8984,8 +9069,10 @@
 "working."
 msgstr ""
+"无法取回你的开放更改组合的列表，因为<br>JOSM 不知道你的身份。<br>你要么选择匿"
+"名工作，否则你无权知道<br>代表你工作的用户的身份。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
 msgid "Missing user identity"
-msgstr "遗失使用者识别"
+msgstr "遗失用户识别"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:120
@@ -8994,5 +9081,5 @@
 "Warning: Failed to retrieve user infos for the current JOSM user. Exception "
 "was: {0}"
-msgstr "警告：无法取得目前的 JOSM 使用者信息。例外为：{0}"
+msgstr "警告：无法取得目前的 JOSM 用户信息。例外为：{0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
@@ -9005,7 +9092,9 @@
 msgstr "选择文件名称"
 
+#. 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 "否"
@@ -9237,5 +9326,5 @@
 #: build/trans_presets.java:992 build/trans_presets.java:1253
 msgid "Layer"
-msgstr "层级"
+msgstr "层数"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
@@ -9314,17 +9403,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "不合格的上传注解"
+msgstr "请修改上传注解"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "反转"
+msgstr "修改"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "继续"
+msgstr "就这样继续"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9336,22 +9422,24 @@
 "explain your change, you will make life<br />easier for many other mappers."
 msgstr ""
+"你的上传注解是<i>空</i>的，或者<i>非常短</i>。<br /><br />这在技术上是允许"
+"的，但请你考虑一下其他的用户，<br />当他们需要一个有意义的更改组合注释，以"
+"<br />决定下一步动作时，他们的感受!<br /><br />如果你现在花几分钟来解释一下你"
+"的更改组合，就可以大大方便其他的编辑者。"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:388
 msgid "Return to the previous dialog to enter a more descriptive comment"
-msgstr ""
+msgstr "返回到上一个对话框中输入一个更具描述性的注释"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "取消并回到编辑器"
+msgstr "取消并返回到上一个对话框"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
 msgid "Ignore this hint and upload anyway"
-msgstr ""
+msgstr "忽略这个提示，强制上传"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "不要再次显示这个信息"
+msgstr "不再显示此消息"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9545,5 +9633,5 @@
 msgstr[0] "正在上传 {0} 个对象..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9726,5 +9814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "描述"
@@ -10555,9 +10643,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:129
 msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "非法的虚线模式，值必须为正"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:135
 msgid "Illegal dash pattern, at least one value must be > 0"
-msgstr ""
+msgstr "非法的虚线模式，至少有一个值必须 > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:102
@@ -10661,6 +10749,6 @@
 "html>"
 msgstr ""
-"<html>执行全自动的程序自 OSM 网站取得存取记号。<br>JOSM 会代表 JOSM 使用者存"
-"取 OSM 网站并且全自动<br>验证使用者以取得存取记号。</html>"
+"<html>执行全自动的程序自 OSM 网站取得存取记号。<br>JOSM 会代表 JOSM 用户存取 "
+"OSM 网站并且全自动<br>验证用户以取得存取记号。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
@@ -10687,12 +10775,12 @@
 "upload requests don't use your password any more."
 msgstr ""
-"请输入您的 OSM 使用者名称和密码。密码将<strong>不会</strong>以明文的方式保存"
-"在 JOSM 偏好设定，同时它也只会传送到 OSM 服务器<strong>一次</strong>。往后的"
-"数据上传要求不会再使用您的密码。"
+"请输入您的 OSM 用户名称和密码。密码将<strong>不会</strong>以明文的方式保存在 "
+"JOSM 偏好设定，同时它也只会传送到 OSM 服务器<strong>一次</strong>。往后的数据"
+"上传要求不会再使用您的密码。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
 msgid "Username: "
-msgstr "使用者名称： "
+msgstr "用户名称： "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:126
@@ -10763,5 +10851,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
 msgid "Please enter your OSM user name"
-msgstr "请输入您的 OSM 使用者名称"
+msgstr "请输入您的 OSM 用户名称"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:407
@@ -10769,5 +10857,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
 msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "使用者名称不能为空白。请输入您的 OSM 使用者名称"
+msgstr "用户名称不能为空白。请输入您的 OSM 用户名称"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:426
@@ -10807,4 +10895,7 @@
 "advanced setting and try again.</html>"
 msgstr ""
+"<html>从 OSM 服务器自动取得 OAuth 存取记号的程序<br>失败，因为 JOSM 无法从 "
+"OAuth 授权<br>端点 URL \\\"{0}\\\" 构建一个有效的登录 URL。<br><br>请检查您的"
+"高级设置，然后再试一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:490
@@ -10816,5 +10907,5 @@
 msgstr ""
 "<html>从 OSM 服务器自动取得 OAuth 存取记号的程序<br>失败。JOSM 无法登入 {0}"
-"<br>使用者：{1}。<br><br>请检查使用者名称和密码后再试一次。</html>"
+"<br>用户：{1}。<br><br>请检查用户名称和密码后再试一次。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -10928,5 +11019,5 @@
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
-msgstr "无法以使用者 \"{0}\" 密码 \"***\" 验证为 OAuth 使用者"
+msgstr "无法以用户 \"{0}\" 密码 \"***\" 验证为 OAuth 用户"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
@@ -10947,5 +11038,5 @@
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
-msgstr "正在验证使用者 \"{0}\" 的 session ..."
+msgstr "正在验证用户 \"{0}\" 的 session ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
@@ -11066,5 +11157,5 @@
 msgstr ""
 "<html>JOSM 成功的取回要求记号。JOSM 现在会在外部浏览器中开启验证网页。请以您"
-"的 OSM 使用者名称和密码登入并按照指示授权给要求记号。接着切换回这个对话框并点"
+"的 OSM 用户名称和密码登入并按照指示授权给要求记号。接着切换回这个对话框并点"
 "击 <strong>{0}</strong><br><br>如果执行外部浏览器失败，您可以复制下列验证 "
 "URL 并将它贴到浏览器的位址列中。</html>"
@@ -11111,10 +11202,10 @@
 #, java-format
 msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
-msgstr "以存取记号键 \"{0}\" 取回使用者详细数据被拒绝。"
+msgstr "以存取记号键 \"{0}\" 取回用户详细数据被拒绝。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
 #, java-format
 msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
-msgstr "以存取记号键 \"{0}\" 取回使用者详细数据被禁止。"
+msgstr "以存取记号键 \"{0}\" 取回用户详细数据被禁止。"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
@@ -11125,6 +11216,6 @@
 "''{3}''.</html>"
 msgstr ""
-"<html>成功的使用存取记号 \"{0}\" 存取<br>OSM 服务器 \"{1}\"。<br>您现在是以使"
-"用者 \"{2}\" id \"{3}\" 存取 OSM 服务器。</html>"
+"<html>成功的使用存取记号 \"{0}\" 存取<br>OSM 服务器 \"{1}\"。<br>您现在是以用"
+"户 \"{2}\" id \"{3}\" 存取 OSM 服务器。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
@@ -11161,6 +11252,6 @@
 msgstr ""
 "<html>存取记号 \"{1}\" 是用于 OSM 服务器 \"{0}\"。<br>然而，以这个记号测试取"
-"回使用者详细数据却失败了。<br>依据这个记号获得的权限您仍有可能使用它<br>上传"
-"数据、GPS 轨迹和/或存取其他受保护的资源。</html>"
+"回用户详细数据却失败了。<br>依据这个记号获得的权限您仍有可能使用它<br>上传数"
+"据、GPS 轨迹和/或存取其他受保护的资源。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
@@ -11176,6 +11267,6 @@
 "Carefully check the server<br>URL and your Internet connection.</html>"
 msgstr ""
-"<html>无法从 OSM 服务器 \"{0}\" 取回关于目前使用者的信息。<br>这可能是测试的"
-"存取记号造成的问题，但<br>也可能是否应服务器组态的问题。请小心检查服务器"
+"<html>无法从 OSM 服务器 \"{0}\" 取回关于目前用户的信息。<br>这可能是测试的存"
+"取记号造成的问题，但<br>也可能是否应服务器组态的问题。请小心检查服务器"
 "<br>URL 和您的互联网网络连接。</html>"
 
@@ -11200,9 +11291,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
 msgid "Retrieving user info..."
-msgstr "正在取回使用者信息..."
+msgstr "正在取回用户信息..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
-msgstr "进阶的偏好设定"
+msgstr "高级偏好设定"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
@@ -11393,5 +11484,5 @@
 msgstr "颜色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11402,35 +11493,35 @@
 msgstr "全部"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "本地文件"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "没有"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "如果没有输入区段时强制绘出的线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "绘出大型 GPS 点。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "从 HDOP 数值绘制圆形。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速率(红 = 慢，绿 = 快)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置的准确误差(红 = 高，绿 = 低，如果可用的话)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "单一颜色(可以为已命名的图层自定义)"
@@ -11438,5 +11529,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11458,5 +11549,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11498,5 +11589,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11510,65 +11601,70 @@
 msgstr "步行"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "绘出方向箭头"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "快速绘制(看起来较丑)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "只有重要的方向提示(例如单行道标签)。"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "只在路径的开头。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "绘制区段顺序编号"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "绘出已下载数据的边界"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "在选择模式绘出虚拟节点"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "将未使用的图层以其他颜色绘制"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "平滑化地图图片(反锯齿)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "读取 GPX 时建立标记。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "作者"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
-msgid "Desc"
-msgstr "柴油"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr "自动"
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "北"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr "两者"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11576,9 +11672,9 @@
 msgstr "开启 GPX 图层时自动从任何航点制作标记图层。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "在原始 GPS 点之间绘出线条"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11586,34 +11682,34 @@
 msgstr "绘出本地文件线条的最大长度(公尺)。设为 \"-1\" 则绘出所有的线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "本地文件最大长度(公尺)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "绘出线条的最大长度(公尺)。设为 \"-1\" 则绘出所有的线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "最大长度(公尺)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "如果输入的数据不含线条信息，仍强制绘出线条。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "绘出线条的方向箭头，连接 GPS 点。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "使用表格查询的方式绘制方向箭头而非复杂的数学运算。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11621,13 +11717,13 @@
 msgstr "如果没有距离最后一个至少这个距离就不要绘出箭头。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "最小距离(像素)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "将 GPS 点以较大的点绘制。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11635,9 +11731,9 @@
 msgstr "所有的点和轨迹区段都使用同样的颜色。可以在图层管理程序自定义。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "依速度来为点和轨迹区段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11645,55 +11741,54 @@
 msgstr "为地点精度 (HDOP) 的点和轨迹区段上色。您的捕捉装置需要能记录这项信息。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "允许依不同的平均速度调整轨迹颜色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "轨迹与点的颜色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+msgstr "允许改变轨迹的标签。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "航点描述"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr "路点标签"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS 点"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "绘出路径区段的方向提示。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "绘出所有区段在其路径中的顺序编号。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
-msgstr "在地图检视应用平滑化以产生较平滑的外观。"
+msgstr "在地图查看应用平滑化以产生较平滑的外观。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "绘出从服务器下载数据的边界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "为了容易修改路径在选择模式中绘出虚拟节点。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "将未使用的数据图层以不同的颜色绘制。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM 数据"
@@ -11718,5 +11813,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93
 msgid "Draw rubber-band helper line"
-msgstr ""
+msgstr "绘制可伸缩辅助线"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42
@@ -11757,5 +11852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
 msgid "Used style"
-msgstr "使用者样式"
+msgstr "用户样式"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
@@ -12063,7 +12158,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "要进行测量的图层"
+msgstr "测量系统"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12431,5 +12525,5 @@
 msgid ""
 "Select to use HTTP basic authentication with your OSM username and password"
-msgstr "选择以使用您的 OSM 使用者名称和密码进行 HTTP 验证"
+msgstr "选择以使用您的 OSM 用户名称和密码进行 HTTP 验证"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
@@ -12460,5 +12554,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
-msgstr "OSM 使用者名称："
+msgstr "OSM 用户名称："
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
@@ -12585,5 +12679,5 @@
 msgid ""
 "Please enter a username and a password if your proxy requires authentication."
-msgstr "如果您的代理服务器需要验证，请输入使用者名称和密码。"
+msgstr "如果您的代理服务器需要验证，请输入用户名称和密码。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
@@ -12688,9 +12782,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
-msgstr ""
+msgstr "预置无父元素的角色元素"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 msgid "Preset sub element without parent"
-msgstr ""
+msgstr "预置无父元素的子元素"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:808
@@ -12760,5 +12854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
 msgid "Show only applicable to selection"
-msgstr ""
+msgstr "只显示可适用的选项"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
@@ -12938,5 +13032,5 @@
 msgstr "正在分析服务器的回应..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -13210,10 +13304,10 @@
 "It supports protocol version 0.6, while the server says it supports {0} to "
 "{1}."
-msgstr "它支持通讯协定版本 0.6，但服务器说它支持 {0} 到 {1} 版。"
+msgstr "它支持通讯协议版本 0.6，但服务器说它支持 {0} 到 {1} 版。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
-msgstr "使用 {1} 版协定建立与 {0} 的连接"
+msgstr "使用 {1} 版协议建立与 {0} 的连接"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:257
@@ -13816,5 +13910,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
 msgid "Reading user info ..."
-msgstr "正在读取使用者信息 ..."
+msgstr "正在读取用户信息 ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
@@ -14561,5 +14655,5 @@
 "<br><br>错误的信息为：<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14587,5 +14681,5 @@
 "严重的错误：无法定位图片 \"{0}\"。这是严重的组态问题。JOSM 会停止运作。"
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14753,5 +14847,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137
 msgid "Defines the visibility of your trace for other OSM users."
-msgstr "定义您的轨迹对其他 OSM 使用者的可见性。"
+msgstr "定义您的轨迹对其他 OSM 用户的可见性。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141
@@ -14817,5 +14911,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:385
 msgid "No username provided."
-msgstr "没有提供使用者名称。"
+msgstr "没有提供用户名称。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:388
@@ -14836,5 +14930,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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
 msgstr "地址编排规则"
@@ -14846,5 +14940,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
 msgid "Define Address Interpolation"
-msgstr ""
+msgstr "定义地址插值"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
@@ -14942,9 +15036,9 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678
 msgid "Please select a street to associate with address interpolation way"
-msgstr ""
+msgstr "请选择一个街道和地址插值方法关联"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:691
 msgid "Please select address interpolation way for this street"
-msgstr ""
+msgstr "请为这条街道选择地址插值方法"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
@@ -15304,5 +15398,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:46
 msgid "Length step:"
-msgstr ""
+msgstr "建筑物长度:"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
@@ -15325,9 +15419,9 @@
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
 msgid "Set width of the building"
-msgstr ""
+msgstr "设置建筑物的宽度"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
 msgid "on polygon"
-msgstr ""
+msgstr "在多边形上"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
@@ -15342,5 +15436,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "建筑物"
@@ -15591,5 +15685,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -15915,5 +16009,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
-msgstr ""
+msgstr "提取公共边界"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
@@ -16100,5 +16194,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
 msgid "Get a new cookie (session timeout)"
-msgstr "取得新的 cookie(作业阶段逾时)"
+msgstr "取得新的 cookie(作业阶段超时)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
@@ -16262,5 +16356,5 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
 msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "沿着选定的路径下载 OSM 数据。"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
@@ -16270,5 +16364,5 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
 msgid "Please select 1 or more ways to download along"
-msgstr ""
+msgstr "请选择 1 或多条路径来沿着下载"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
@@ -16369,5 +16463,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26
 msgid "External tools"
-msgstr ""
+msgstr "外部工具"
 
 #. Plugin ext_tools
@@ -16375,10 +16469,10 @@
 #: build/trans_plugins.java:26
 msgid "Use external scripts in JOSM"
-msgstr ""
+msgstr "在 JOSM 使用扩展脚本"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:73
 #, java-format
 msgid "Delete tool \"{0}\"?"
-msgstr ""
+msgstr "删除工具 \"{0}\"?"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
@@ -16388,9 +16482,9 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
 msgid "New tool..."
-msgstr ""
+msgstr "新工具..."
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
 msgid "Install"
-msgstr ""
+msgstr "安装"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -16667,5 +16761,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:199
 msgid "Running Douglas-Peucker approximation..."
-msgstr "执行近似 Douglas-Peucker..."
+msgstr "执行近似道格拉斯-普克法 (Douglas-Peucker)..."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
@@ -16859,5 +16953,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
-msgstr "无法撷取图片"
+msgstr "无法获得图片"
 
 #: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:149
@@ -16917,5 +17011,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90
 msgid "Capture GPS Track"
-msgstr "撷取 GPS 轨迹"
+msgstr "捕获 GPS 轨迹"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
@@ -17002,5 +17096,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:52
 msgid "Michigan Left"
-msgstr "密西根左转"
+msgstr "密歇根左转"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:50
@@ -17023,5 +17117,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:201
 msgid "Create Michigan left turn restriction"
-msgstr "建立密西根左转弯限制"
+msgstr "建立密歇根左转弯限制"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:160
@@ -17204,5 +17298,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
 msgid "Please enter a user name"
-msgstr "请输入使用者名称"
+msgstr "请输入用户名称"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
@@ -17233,9 +17327,9 @@
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
 msgid "Open only files that are visible in current view."
-msgstr "只开启在目前的检视中可见的文件。"
+msgstr "只开启在目前的查看中可见的文件。"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
 msgid "No view open - cannot determine boundaries!"
-msgstr "没有开启检视 - 不能决定边界!"
+msgstr "没有开启查看 - 不能决定边界!"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114
@@ -17528,5 +17622,5 @@
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:430
 msgid "Meta"
-msgstr ""
+msgstr "功能"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:74
@@ -17564,10 +17658,9 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
 msgid "change the viewport"
-msgstr "改变检视端口"
+msgstr "改变查看端口"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "合并的版本"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -17708,9 +17801,9 @@
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 msgid "Road Sign Plugin"
-msgstr ""
+msgstr "路标插件"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
 msgid "Roadsign tagging"
-msgstr ""
+msgstr "Roadsign tagging"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
@@ -18188,13 +18281,13 @@
 msgstr "连栋建筑"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "编辑鞋店"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "分隔线"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18477,5 +18570,5 @@
 #, java-format
 msgid "multiple objects with role ''{0}''"
-msgstr ""
+msgstr "带有角色 \"{0}\" 的多个对象"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245
@@ -18509,22 +18602,22 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:14
 msgid "No Straight On"
-msgstr ""
+msgstr "禁止直行"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:15
 msgid "Only Right Turn"
-msgstr ""
+msgstr "只可右转"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:16
 msgid "Only Left Turn"
-msgstr ""
+msgstr "只可左转"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:17
 msgid "Only Straight On"
-msgstr ""
+msgstr "只可直行"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:34
 #, java-format
 msgid "Warning: failed to load icon for turn restriction type ''{0}''"
-msgstr ""
+msgstr "警告：无法加载转弯限制类型 ''{0}'' 的图标"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75
@@ -18685,10 +18778,10 @@
 "disabled, editing of via-objects is possible in the Advanced Editor only."
 msgstr ""
-"基本编辑器可以选择性显示转弯限制的 via-对象清单。如果启用，就可以在基本编辑器"
-"中编辑它们。如果停用，就只能在进阶编辑器中编辑 via-对象。"
+"基本编辑器可以选择性显示转弯限制的经过对象清单。如果启用，就可以在基本编辑器"
+"中编辑它们。如果停用，就只能在进阶编辑器中编辑经过对象。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
 msgid "Display and edit list of via-objects in the Basic Editor"
-msgstr "在基本编辑器显示与编辑 via-对象"
+msgstr "在基本编辑器显示与编辑经过对象"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
@@ -18710,4 +18803,5 @@
 "Assuming the default value ''set-a''."
 msgstr ""
+"警告：偏好设定键 \"{0}\" 有不支持的数值 \"{1}\"。推测预设数值应为 \"set-a\"。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:48
@@ -18756,4 +18850,7 @@
 "the way with role <tt>to</tt>, though."
 msgstr ""
+"用于 OSM 路径的这个转弯限制 <span class=\"object-name\">{0}</span> 带有角色"
+"<tt>出发</tt><strong>和</strong>角色<tt>到达</tt>。然而，在一个转弯限制中，带"
+"有角色<tt>出发</tt>的路径不应与带有角色<tt>到达</tt>的路径相同。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
@@ -18813,4 +18910,9 @@
 "object."
 msgstr ""
+"<strong>出发</strong>路径 <span class=\"object-name\">{0}</span> 和<strong>到"
+"达</strong>路径 <span class=\"object-name\">{1}</span> 于节点 <span class="
+"\"object-name\">{2}</span> 交叉，但 <span class=\"object-name\">{2}</span> 不"
+"是一个<strong>经过</strong>对象。<br>建议将 <span class=\"object-name\">{2}</"
+"span> 设置为唯一的<strong>经过</strong>对象。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
@@ -18836,9 +18938,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
 msgid "An OSM way with role <tt>from</tt> is required in a turn restriction."
-msgstr ""
+msgstr "一条带有角色<tt>出发</tt>的 OSM 路径需要在一个转弯限制中。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
 msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-msgstr ""
+msgstr "一条带有角色<tt>到达</tt>的 OSM 路径需要在一个转弯限制中。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
@@ -18852,9 +18954,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
 msgid "Add an OSM way with role ''from''"
-msgstr ""
+msgstr "加入一条带有角色\"出发\"的 OSM 路径"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54
 msgid "Add an OSM way with role ''to''"
-msgstr ""
+msgstr "加入一条带有角色\"到达\"的 OSM 路径"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
@@ -18864,4 +18966,6 @@
 "turn restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"一个转弯限制只需要一个带有角色 <tt>from</tt> 的路径。这个转弯限制有 {0} 个路"
+"径有此标签。请删除其中的 {1} 个。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
@@ -18871,4 +18975,6 @@
 "restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"一个转弯限制只需要一个带有角色 <tt>to</tt> 的路径。这个转弯限制有 {0} 个路径"
+"有此标签。请删除其中的 {1} 个。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
@@ -18911,4 +19017,7 @@
 "connects to way <span class=\"object-name\">{3}</span>."
 msgstr ""
+"带有角色 <tt>{1}</tt> 的 OSM 路径 <span class=\"object-name\">{0}</span> 应被"
+"在连接路径 <span class=\"object-name\">{3}</span> 的节点 <span class="
+"\"object-name\">{2}</span> 处切割。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
@@ -19057,5 +19166,5 @@
 "An OSM data validator that checks for common errors made by users and editor "
 "programs."
-msgstr "OSM 数据检验器，能够检查使用者与编辑器程序造成的一般性错误。"
+msgstr "OSM 数据检验器，能够检查用户与编辑器程序造成的一般性错误。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:101
@@ -19169,5 +19278,5 @@
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "修正 ({0}/{1}): ''{2}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:507
@@ -19242,25 +19351,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
 msgid "Mixed type duplicated nodes"
-msgstr ""
+msgstr "重复的混合类型节点"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
 msgid "Highway duplicated nodes"
-msgstr ""
+msgstr "重复的公路节点"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
 msgid "Railway duplicated nodes"
-msgstr ""
+msgstr "重复的铁路节点"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
 msgid "Waterway duplicated nodes"
-msgstr ""
+msgstr "重复的水路节点"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
 msgid "Boundary duplicated nodes"
-msgstr ""
+msgstr "重复的边境节点"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
 msgid "Power duplicated nodes"
-msgstr ""
+msgstr "重复的电线节点"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:262
@@ -19297,5 +19406,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "多重多边形"
@@ -19531,5 +19640,5 @@
 #, java-format
 msgid "Key ''{0}'' invalid."
-msgstr ""
+msgstr "无效的键 \"{0}\"。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
@@ -19572,5 +19681,5 @@
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr ""
+msgstr "不是预设的键 \"{0}\"。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:549
@@ -19581,5 +19690,5 @@
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
+msgstr "不是为键 \"{1}\" 预设的值 \"{0}\"。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:572
@@ -19698,10 +19807,10 @@
 #, java-format
 msgid "Illegal expression ''{0}''"
-msgstr ""
+msgstr "非法的表达式 \"{0}\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1010
 #, java-format
 msgid "Illegal regular expression ''{0}''"
-msgstr ""
+msgstr "非法的正则表达式 \"{0}\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:35
@@ -19860,5 +19969,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68
 msgid "No tags"
-msgstr ""
+msgstr "无标记"
 
 #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
@@ -19873,25 +19982,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
 msgid "Has tag containing ''fixme'' or ''FIXME''"
-msgstr ""
+msgstr "已标记 \"fixme\" 或 \"FIXME\""
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87
 msgid "Has key ''note'' or ''comment'' or ''description''"
-msgstr ""
+msgstr "有键 \"note\" 或 \"comment\" 或 \"description\""
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
 msgid "Has key ''created_by'' or ''converted_by''"
-msgstr ""
+msgstr "有键 \"created_by\" 或 \"converted_by\""
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
 msgid "Has key ''watch''"
-msgstr ""
+msgstr "有键 \"watch\""
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
 msgid "Has key ''source''"
-msgstr ""
+msgstr "有键 “source\""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62
@@ -19913,5 +20022,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
 msgid "Untagged ways (commented)"
-msgstr ""
+msgstr "无标签的路径 (已注解)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
@@ -19963,62 +20072,62 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
 msgid "Import Video"
-msgstr ""
+msgstr "导入视频"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
 msgid "Sync a video against this GPS track"
-msgstr ""
+msgstr "与 GPS 轨迹同步视频"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
 msgid "Remove Video"
-msgstr ""
+msgstr "删除视频"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
 msgid "removes current video from layer"
-msgstr ""
+msgstr "从图层中删除当前视频"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
 msgid "play/pause"
-msgstr ""
+msgstr "播放/暂停"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
 msgid "starts/pauses video playback"
-msgstr ""
+msgstr "开始/暂停播放视频"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
 msgid "backward"
-msgstr ""
+msgstr "后退"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
 msgid "jumps n sec back"
-msgstr ""
+msgstr "跳至后 n 秒"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
 msgid "forward"
-msgstr ""
+msgstr "前进"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
 msgid "jumps n sec forward"
-msgstr ""
+msgstr "跳至前 n 秒"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
 msgid "faster"
-msgstr ""
+msgstr "加速"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
 msgid "faster playback"
-msgstr ""
+msgstr "加速播放"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175
 msgid "slower"
-msgstr ""
+msgstr "减速"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175
 msgid "slower playback"
-msgstr ""
+msgstr "减速播放"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:102
 msgid "loop"
-msgstr ""
+msgstr "循环"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
@@ -20072,5 +20181,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
 msgid "play"
-msgstr ""
+msgstr "播放"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
@@ -20140,5 +20249,5 @@
 #, java-format
 msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr ""
+msgstr "<html>没有路径连接到节点 ''{0}''。正在跳过。</html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
@@ -20170,5 +20279,5 @@
 #, java-format
 msgid "Node ''{0}'' is a junction with more than 2 connected ways."
-msgstr ""
+msgstr "节点 \"{0}\" 是一个有超过 2 条路径连接的交汇处。"
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
@@ -20272,5 +20381,5 @@
 "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
 "or a trailing '?'."
-msgstr ""
+msgstr "警告：WMS 服务基础 URL \"{0}\"  没有以 '&' 或 '?' 结尾。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
@@ -20283,5 +20392,5 @@
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
-msgstr ""
+msgstr "警告：完整 URL 为 \"{0}\"。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
@@ -20291,9 +20400,11 @@
 "This may lead to wrong coordinates."
 msgstr ""
+"URL 中的投影 \"{0}\" 与目前的投影 \"{1}\" 不符。\n"
+"这可能会导致错误的坐标。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:108
 #, java-format
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
-msgstr ""
+msgstr "警告：WMS 图层已停用，因为基础 URL \"{0}\" 出现异常"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
@@ -20319,4 +20430,7 @@
 "tiles anyway?"
 msgstr ""
+"<html>这个 WMS 图层的基础 URL<br>\"{0}\"<br>的结尾不能是 \"&\" 或 \"?\" 。"
+"<br>这可能会导致无效的 WMS 要求。您应该检查您的<br>偏好设定值。<br>是否要强制"
+"取回 WMS 拼贴?\""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
@@ -20450,5 +20564,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
 msgid "Simultaneous connections"
-msgstr ""
+msgstr "同时连接"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20532,5 +20646,5 @@
 msgctxt "Relation type"
 msgid "boundary"
-msgstr ""
+msgstr "边界"
 
 #. relation type
@@ -20544,5 +20658,5 @@
 msgctxt "Relation type"
 msgid "line"
-msgstr ""
+msgstr "高压线"
 
 #. relation type
@@ -20550,5 +20664,5 @@
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr ""
+msgstr "多重多边形"
 
 #. relation type
@@ -20556,5 +20670,5 @@
 msgctxt "Relation type"
 msgid "network"
-msgstr ""
+msgstr "网络"
 
 #. relation type
@@ -20562,5 +20676,5 @@
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr ""
+msgstr "公共交通"
 
 #. relation type
@@ -20568,5 +20682,5 @@
 msgctxt "Relation type"
 msgid "restriction"
-msgstr ""
+msgstr "限制"
 
 #. relation type
@@ -20574,5 +20688,5 @@
 msgctxt "Relation type"
 msgid "route"
-msgstr ""
+msgstr "路线"
 
 #. relation type
@@ -20580,5 +20694,5 @@
 msgctxt "Relation type"
 msgid "site"
-msgstr ""
+msgstr "站点"
 
 #. relation type
@@ -20586,5 +20700,5 @@
 msgctxt "Relation type"
 msgid "waterway"
-msgstr ""
+msgstr "水路"
 
 #. Strings in JFileChooser
@@ -20832,7 +20946,7 @@
 "true :-)"
 msgstr ""
-"允许使用者建立不同的颜色配置并在它们之间切换。只要改变颜色并建立新的配置即"
-"可。可用来切换为白色背景以便在明亮的阳光下有较佳的视觉感受。请查阅 JOSM 偏好"
-"设定中的对话框与\"地图设定值\" (有点怪但确是真的 :-)"
+"允许用户建立不同的颜色配置并在它们之间切换。只要改变颜色并建立新的配置即可。"
+"可用来切换为白色背景以便在明亮的阳光下有较佳的视觉感受。请查阅 JOSM 偏好设定"
+"中的对话框与\"地图设定值\" (有点怪但确是真的 :-)"
 
 #. Plugin Create_grid_of_ways
@@ -20863,5 +20977,5 @@
 #: build/trans_plugins.java:20
 msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "沿着一条路径下载 OSM 数据"
 
 #. Plugin Duplicate-Way
@@ -20875,5 +20989,5 @@
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
 "very fast."
-msgstr "允许使用者非常快速的隐藏时间戳记并删除大量 GPX 轨迹的部分。"
+msgstr "允许用户非常快速的隐藏时间戳记并删除大量 GPX 轨迹的部分。"
 
 #. Plugin globalsat
@@ -20905,5 +21019,5 @@
 #: build/trans_plugins.java:36
 msgid "Helps vectorizing WMS images."
-msgstr "协助将 WMS 图片矢量化。"
+msgstr "帮助将 WMS 图片矢量化。"
 
 #. Plugin livegps
@@ -21062,5 +21176,5 @@
 "the jar-file as standalone as well."
 msgstr ""
-"在帮助菜单中加入标签预设组合测试器，可以协助您进行标签预设组合的开发(会弹出快"
+"在帮助菜单中加入标签预设组合测试器，可以帮助您进行标签预设组合的开发(会弹出快"
 "速预览对话框)。您也可以单独以 jar-文件的方式启动。"
 
@@ -21279,5 +21393,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "道路编号"
@@ -21816,5 +21930,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "金属"
@@ -21827,5 +21941,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "木头"
@@ -22073,5 +22187,5 @@
 #: build/trans_presets.java:385 build/trans_presets.java:473
 msgid "Access"
-msgstr ""
+msgstr "通行"
 
 #. item "Highways/Streets/Road Restrictions" combo "Access"
@@ -22103,4 +22217,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22129,11 +22305,42 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
-msgstr "是"
+msgstr "允许"
 
 #. color permissive
@@ -22169,5 +22376,5 @@
 #: build/trans_style.java:219
 msgid "destination"
-msgstr "目的地"
+msgstr "仅目的地"
 
 #. color deprecated
@@ -22196,5 +22403,5 @@
 #: build/trans_presets.java:475 build/trans_style.java:205
 msgid "permissive"
-msgstr "随意"
+msgstr "宽容"
 
 #: build/trans_presets.java:385 build/trans_presets.java:389
@@ -22218,5 +22425,5 @@
 #: build/trans_presets.java:475
 msgid "delivery"
-msgstr ""
+msgstr "交付"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
@@ -22241,15 +22448,46 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
-msgstr "否"
+msgstr "不许"
 
 #: build/trans_presets.java:386
 msgid "Agricultural"
-msgstr "农业的"
+msgstr "农业"
 
 #: build/trans_presets.java:386 build/trans_presets.java:387
@@ -22263,5 +22501,5 @@
 #: build/trans_presets.java:501 build/trans_presets.java:502
 msgid "designated"
-msgstr "已指定"
+msgstr "指定"
 
 #: build/trans_presets.java:387 build/trans_presets.java:388
@@ -22274,5 +22512,5 @@
 #: build/trans_presets.java:500 build/trans_presets.java:501
 msgid "official"
-msgstr "正式"
+msgstr "官方"
 
 #: build/trans_presets.java:389
@@ -22352,20 +22590,20 @@
 #: build/trans_presets.java:397 build/trans_presets.java:436
 msgid "Max. weight (tonnes)"
-msgstr "总重限制(吨)"
+msgstr "总重限制 (吨)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
 #: build/trans_presets.java:398
 msgid "Max. Height (meters)"
-msgstr "高度限制(米)"
+msgstr "高度限制 (米)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:399
 msgid "Max. Width (meters)"
-msgstr "宽度限制(米)"
+msgstr "宽度限制 (米)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:400
 msgid "Max. Length (meters)"
-msgstr "长度限制(米)"
+msgstr "长度限制 (米)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
@@ -22667,5 +22905,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "健行"
@@ -22700,5 +22938,5 @@
 msgstr "良好"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "中级"
@@ -22712,5 +22950,13 @@
 msgstr "恐怖的"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "轮椅"
@@ -22839,4 +23085,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22868,14 +23122,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "经营者"
@@ -23137,12 +23395,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "海拔"
@@ -23444,5 +23702,5 @@
 #: build/trans_presets.java:952
 msgid "Drain"
-msgstr ""
+msgstr "渠"
 
 #. item "Water/Water/Drain"
@@ -23450,10 +23708,10 @@
 #: build/trans_presets.java:954
 msgid "Edit Drain"
-msgstr ""
+msgstr "编辑渠"
 
 #. item "Water/Water/Drain" combo "Layer"
 #: build/trans_presets.java:960
 msgid "Ditch"
-msgstr ""
+msgstr "沟"
 
 #. item "Water/Water/Ditch"
@@ -23461,5 +23719,5 @@
 #: build/trans_presets.java:962
 msgid "Edit Ditch"
-msgstr ""
+msgstr "编辑沟"
 
 #. item "Water/Water/Ditch" combo "Layer"
@@ -23518,10 +23776,10 @@
 #: build/trans_presets.java:1007
 msgid "Basin"
-msgstr ""
+msgstr "水池"
 
 #. item "Water/Water/Basin"
 #: build/trans_presets.java:1008
 msgid "Edit Basin Landuse"
-msgstr ""
+msgstr "编辑水池"
 
 #. item "Water/Water/Basin" text "Name"
@@ -23746,5 +24004,5 @@
 #: build/trans_presets.java:1123
 msgid "Turning Point"
-msgstr ""
+msgstr "回旋点"
 
 #. item "Waterway Point/Turning Point"
@@ -23994,5 +24252,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "电压"
@@ -24161,10 +24419,10 @@
 #: build/trans_presets.java:1293
 msgid "Aerialway"
-msgstr "空中路线"
+msgstr "空中线路"
 
 #. group "Aerialway"
 #: build/trans_presets.java:1294
 msgid "Chair Lift"
-msgstr "滑雪缆车"
+msgstr "椅式升降机"
 
 #. item "Aerialway/Chair Lift"
@@ -24172,10 +24430,10 @@
 #: build/trans_presets.java:1296
 msgid "Edit Chair Lift"
-msgstr "编辑滑雪缆车"
+msgstr "编辑椅式升降机"
 
 #. item "Aerialway/Chair Lift" text "Name"
 #: build/trans_presets.java:1300
 msgid "Drag Lift"
-msgstr ""
+msgstr "拖曳升降机"
 
 #. item "Aerialway/Drag Lift"
@@ -24183,5 +24441,5 @@
 #: build/trans_presets.java:1302
 msgid "Edit Drag Lift"
-msgstr ""
+msgstr "编辑拖曳升降机"
 
 #. item "Aerialway/Drag Lift" text "Name"
@@ -24199,5 +24457,5 @@
 #: build/trans_presets.java:1312
 msgid "Gondola"
-msgstr ""
+msgstr "吊舱"
 
 #. item "Aerialway/Gondola"
@@ -24205,5 +24463,5 @@
 #: build/trans_presets.java:1314
 msgid "Edit Gondola"
-msgstr ""
+msgstr "编辑吊舱"
 
 #. item "Aerialway/Gondola" text "Name"
@@ -24224,5 +24482,5 @@
 msgctxt "aerialway"
 msgid "Pylon"
-msgstr ""
+msgstr "吊塔"
 
 #. item "Aerialway/Pylon"
@@ -24231,5 +24489,5 @@
 msgctxt "aerialway"
 msgid "Edit Pylon"
-msgstr ""
+msgstr "编辑吊塔"
 
 #. group "Car"
@@ -24249,5 +24507,5 @@
 #: build/trans_presets.java:1339
 msgid "Agip"
-msgstr ""
+msgstr "阿吉普 (Agip)"
 
 #: build/trans_presets.java:1339
@@ -24261,5 +24519,5 @@
 #: build/trans_presets.java:1339
 msgid "BP"
-msgstr ""
+msgstr "英国石油 (BP)"
 
 #: build/trans_presets.java:1339
@@ -24273,5 +24531,5 @@
 #: build/trans_presets.java:1339
 msgid "Q8"
-msgstr ""
+msgstr "科威特石油 (Q8)"
 
 #: build/trans_presets.java:1339
@@ -24281,5 +24539,5 @@
 #: build/trans_presets.java:1339
 msgid "Shell"
-msgstr ""
+msgstr "壳牌 (Shell)"
 
 #: build/trans_presets.java:1339
@@ -24297,5 +24555,5 @@
 #: build/trans_presets.java:1339
 msgid "Total"
-msgstr ""
+msgstr "道达尔 (Total)"
 
 #: build/trans_presets.java:1339
@@ -24304,6 +24562,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24355,32 +24615,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "开放时间"
@@ -24389,4 +24649,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24439,174 +24700,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
-msgstr "24/7"
-
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+msgstr "24 小时"
+
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "周一-周五 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "周二-周日 08:00-15:00; 周六 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "燃油类型："
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
 msgstr "柴油"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
 msgstr "生物柴油"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "重型货车用柴油"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr "91 号汽油"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr "95 号汽油"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr "98 号汽油"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr "100 号汽油"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (添加 10% 乙醇)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (添加 85% 乙醇)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "液化石油气"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
 msgstr "压缩天然气"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24636,7 +24898,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr ""
@@ -24652,5 +24914,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "地下"
@@ -24663,6 +24925,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "费用"
@@ -24726,5 +24988,5 @@
 #: build/trans_presets.java:1398
 msgid "Sharing"
-msgstr ""
+msgstr "共享"
 
 #. item "Car/Sharing"
@@ -24732,5 +24994,5 @@
 #: build/trans_presets.java:1400
 msgid "Edit Car Sharing"
-msgstr ""
+msgstr "编辑汽车共享"
 
 #. item "Bicycle/Parking"
@@ -24769,5 +25031,5 @@
 #: build/trans_presets.java:1431
 msgid "UIC-Reference"
-msgstr ""
+msgstr "国际铁路联盟编号"
 
 #. item "Public Transport/Station" text "UIC-Reference"
@@ -24838,5 +25100,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "轮椅"
@@ -24873,6 +25135,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
 msgstr ""
@@ -24880,5 +25142,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "长椅"
@@ -24997,5 +25259,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr "灯标"
@@ -25055,11 +25317,241 @@
 msgstr "编辑旅馆"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "星级"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr "航站楼"
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "电话号码"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "汽车旅馆"
@@ -25067,20 +25559,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "编辑汽车旅馆"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
-msgstr ""
+msgstr "宾馆/招待所"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
-msgstr ""
-
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+msgstr "编辑宾馆/招待所"
+
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "小木屋"
@@ -25088,10 +25580,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "编辑小木屋"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "招待所"
@@ -25099,30 +25591,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "编辑招待所"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "高山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "编辑高山小屋"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "露营区"
@@ -25130,10 +25622,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "编辑露营区"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "食物+饮料"
@@ -25144,5 +25636,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐厅"
@@ -25150,11 +25642,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "编辑餐厅"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "烹调风格"
@@ -25162,78 +25654,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
 msgstr "意大利文"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
 msgstr "中式"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "披萨"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "汉堡"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
 msgstr "希腊式"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
 msgstr "德式"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "亚式"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
 msgstr "泰式"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "墨西哥式"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
 msgstr "日式"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
 msgstr "法式"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "三明治"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "寿司"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "快餐"
@@ -25241,17 +25734,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "编辑快餐餐厅"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr "鱼和薯条"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr "鸡肉"
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "咖啡"
@@ -25259,9 +25764,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "编辑咖啡厅"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "酒店"
@@ -25269,19 +25775,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "编辑酒店"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "酒吧"
@@ -25289,9 +25796,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "编辑酒吧"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "夜店"
@@ -25299,24 +25807,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "编辑夜店"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "旅游相关"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "景点"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "编辑景点"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "博物馆"
@@ -25324,9 +25833,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "编辑博物馆"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "动物园"
@@ -25335,9 +25844,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "编辑动物园"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "景点"
@@ -25345,24 +25854,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "编辑景点"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "主题乐园"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "编辑主题乐园"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "艺术工作"
@@ -25370,5 +25879,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "编辑艺术工作"
@@ -25376,19 +25885,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "信息服务处"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "地图"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25426,5 +25935,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25432,28 +25941,28 @@
 msgstr "街"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
-msgstr ""
-
-#: build/trans_presets.java:1748
+msgstr "站点"
+
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "城市"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25463,5 +25972,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25469,5 +25978,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "健走"
@@ -25475,6 +25984,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "自行车"
@@ -25482,5 +25991,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25488,6 +25997,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "滑雪"
@@ -25495,5 +26004,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25501,46 +26010,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "信息板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
-msgstr ""
-
-#: build/trans_presets.java:1764
+msgstr "提示"
+
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "历史"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "野生"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "路牌"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25549,5 +26058,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25555,29 +26064,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "电话号码"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "其他的信息点"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
 msgstr "编辑庇护所"
@@ -25585,25 +26094,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "壁炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "野餐区"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "编辑野餐区"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "历史地区"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "城堡"
@@ -25612,19 +26121,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "编辑城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "遗迹"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "编辑遗迹"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "考古学地区"
@@ -25633,9 +26142,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "编辑考古学地区"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "战场"
@@ -25643,10 +26152,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "编辑战场"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr "古生物现场"
@@ -25654,5 +26163,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr "编辑古生物现场"
@@ -25660,15 +26169,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "纪念建筑"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "编辑纪念建筑"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "纪念碑"
@@ -25676,55 +26185,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "编辑纪念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "边界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "编辑边界石"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "休闲"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "水上乐园"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "编辑水上乐园"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "运动场"
@@ -25732,35 +26241,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "编辑运动场"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "钓鱼"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "编辑钓鱼场"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
-msgstr "运动用品"
+msgstr "运动"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "运动设施"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "竞技场"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "编辑竞技扬"
@@ -25774,6 +26283,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "选择运动："
@@ -26189,6 +26698,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26223,240 +26732,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "多种"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "田径"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
 msgstr "橄榄球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "篮球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "保龄球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
 msgstr "加拿大足球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "独木舟"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "自行车"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "赛狗"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "马术"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "高尔夫"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "赛马"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "摩托车"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "射击"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr "滑冰"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "网球"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "运动中心"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "编辑运动中心"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr "足球场"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr "编辑足球场"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "编辑跑道"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "高尔夫路线"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "编辑高尔夫路线"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "迷你高尔夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "编辑迷你高尔夫"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "运动"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "多种"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "编辑多种"
@@ -26498,23 +27007,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "类型"
@@ -26556,211 +27065,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "运动中心"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "竞技扬"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
-msgstr ""
-
-#: build/trans_presets.java:1968
+msgstr "轨迹"
+
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "田径"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "编辑田径"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "编辑射箭"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "编辑攀岩"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "独木舟"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "编辑独木舟"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "编辑自行车"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "赛狗"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "编辑赛狗"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "马术"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "编辑马术"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "赛马"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "编辑赛马"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "编辑体操"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "摩托车运动"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "编辑摩托车运动"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "编辑溜冰"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "编辑滑板"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "编辑游泳"
@@ -26768,52 +27277,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "编辑滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
-msgstr ""
+msgstr "滑雪方式"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
-msgstr ""
-
-#: build/trans_presets.java:2057
+msgstr "高山"
+
+#: build/trans_presets.java:2237
 msgid "nordic"
-msgstr ""
-
-#: build/trans_presets.java:2057
+msgstr "北欧"
+
+#: build/trans_presets.java:2237
 msgid "snow_park"
-msgstr ""
-
-#: build/trans_presets.java:2058
+msgstr "公园"
+
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "困难度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "进阶"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "专家"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "射击"
@@ -26821,204 +27330,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "编辑射击"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "运动(球类)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "编辑足球"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "编辑澳洲足球"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
-msgstr ""
+msgstr "美式足球"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
-msgstr ""
-
-#: build/trans_presets.java:2088
+msgstr "编辑美式足球"
+
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
-msgstr ""
+msgstr "加拿大式足球"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
-msgstr ""
-
-#: build/trans_presets.java:2094
+msgstr "编辑加拿大式足球"
+
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
-msgstr ""
+msgstr "盖尔式足球"
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
-msgstr ""
-
-#: build/trans_presets.java:2100
+msgstr "编辑盖尔式足球"
+
+#: build/trans_presets.java:2280
 msgid "Rugby League"
-msgstr ""
+msgstr "联盟式橄榄球"
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
-msgstr ""
-
-#: build/trans_presets.java:2106
+msgstr "编辑联盟式橄榄球"
+
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
-msgstr ""
+msgstr "联合式橄榄球"
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
-msgstr ""
-
-#: build/trans_presets.java:2112
+msgstr "编辑联合式橄榄球"
+
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "编辑棒球"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "篮球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "编辑篮球"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "高尔夫"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "编辑高尔夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "高尔夫路线"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
-msgstr ""
+msgstr "草地滚球"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
-msgstr ""
-
-#: build/trans_presets.java:2136
+msgstr "编辑草地滚球"
+
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "保龄球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "编辑保龄球"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
-msgstr ""
+msgstr "板球"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
-msgstr ""
-
-#: build/trans_presets.java:2148
+msgstr "编辑板球"
+
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
-msgstr ""
+msgstr "板球网"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
-msgstr ""
-
-#: build/trans_presets.java:2154
+msgstr "编辑板球网"
+
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "编辑木球"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
-msgstr "编曲棍球"
-
-#: build/trans_presets.java:2166
+msgstr "编辑曲棍球"
+
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "编辑回力球"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
-msgstr ""
+msgstr "墙网球"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
-msgstr ""
-
-#: build/trans_presets.java:2178
+msgstr "编辑墙网球"
+
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "编辑桌球"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "网球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "编辑网球"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "人造"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "建筑物"
@@ -27026,5 +27535,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "公共建筑"
@@ -27032,10 +27541,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "编辑公共建筑"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "县市政府/公所"
@@ -27043,10 +27552,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "编辑县市政府/公所"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "大使馆"
@@ -27054,10 +27563,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "编辑大使馆"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "法院"
@@ -27066,10 +27575,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "编辑法院"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "监狱"
@@ -27078,10 +27587,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "编辑监狱"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "警察局"
@@ -27091,10 +27600,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "编辑警察局"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "消防队"
@@ -27103,10 +27612,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "编辑消防队"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "邮局"
@@ -27114,5 +27623,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "编辑邮局"
@@ -27120,15 +27629,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
-msgstr "幼稚园"
+msgstr "幼儿园"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
-msgstr "编辑幼稚园"
+msgstr "编辑幼儿园"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "学校"
@@ -27136,10 +27645,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "编辑学校"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "大学"
@@ -27147,10 +27656,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "编辑大学"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "学院"
@@ -27158,5 +27667,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "编辑学院"
@@ -27164,5 +27673,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "电影院"
@@ -27171,10 +27680,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "编辑电影院"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "图书馆"
@@ -27183,9 +27692,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "编辑图书馆"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "美术馆"
@@ -27193,10 +27702,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "编辑美术馆"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "剧院"
@@ -27205,10 +27714,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "编辑剧院"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "宗教仪式场所"
@@ -27218,5 +27727,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "编辑宗教仪式场所"
@@ -27225,6 +27734,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "宗教"
@@ -27233,66 +27742,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "犹太教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "锡克教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "教派"
@@ -27301,81 +27810,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "英国国教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "浸信会"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "福音派教会"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "卫理公会教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "摩门教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "东正教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "圣灵降临教派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "长老派教会"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "什叶派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "逊尼派"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "地址"
@@ -27384,5 +27893,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "编辑地址信息"
@@ -27390,5 +27899,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "门牌号码"
@@ -27396,25 +27905,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "房屋名称"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "街道名称"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "城市名称"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "邮递区号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "国码"
@@ -27423,67 +27932,67 @@
 #. <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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
-msgstr ""
+msgstr "编辑地址插值方法"
 
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "编号规则"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "按字母顺序"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "编辑作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "编辑塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "塔类型"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "通讯"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "观测"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "高度(米)"
@@ -27491,25 +28000,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "贮水塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "编辑贮水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "贮气桶"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "编辑贮气桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "灯塔"
@@ -27517,10 +28026,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "编辑灯塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "风车"
@@ -27528,53 +28037,53 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "编辑风车"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
-msgstr "油管"
+msgstr "管道"
 
 #. item "Man Made/Pipeline"
 #. <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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
-msgstr "编辑油管"
-
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+msgstr "编辑管道"
+
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "天然气"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2382
+msgstr "热力"
+
+#: build/trans_presets.java:2562
 msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2382
+msgstr "石油"
+
+#: build/trans_presets.java:2562
 msgid "sewage"
-msgstr ""
-
-#: build/trans_presets.java:2382
+msgstr "污水"
+
+#: build/trans_presets.java:2562
 msgid "any substance"
-msgstr ""
-
-#: build/trans_presets.java:2383
+msgstr "任何物质"
+
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "位置"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
-msgstr ""
-
-#: build/trans_presets.java:2383
+msgstr "水下"
+
+#: build/trans_presets.java:2563
 msgid "overground"
-msgstr ""
-
-#: build/trans_presets.java:2385
+msgstr "地上"
+
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "污水处理厂"
@@ -27584,10 +28093,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "编辑污水处理厂"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "起重机"
@@ -27595,5 +28104,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "编辑起重机"
@@ -27601,10 +28110,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
-msgstr ""
+msgstr "编辑灯标"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "测量点"
@@ -27612,10 +28121,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "编辑测量点"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "监视"
@@ -27623,23 +28132,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "编辑监视摄影机"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
-msgstr ""
-
-#: build/trans_presets.java:2416
+msgstr "室内"
+
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "户外"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
-msgstr ""
+msgstr "公共"
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "发电厂"
@@ -27649,65 +28158,65 @@
 #. 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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "编辑发电厂"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "风力"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "光电"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
-msgstr "发电厂"
+msgstr "配电站"
 
 #. item "Man Made/Power Station"
 #. <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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
-msgstr "编辑发电厂"
+msgstr "编辑配电站"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
-msgstr ""
+msgstr "配电分站"
 
 #. item "Man Made/Power Sub Station"
 #. <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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
-msgstr ""
+msgstr "编辑配电分站"
 
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
-msgstr ""
+msgstr "电线编号"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "电塔"
@@ -27718,23 +28227,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "编辑电塔"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
-msgstr ""
-
-#: build/trans_presets.java:2451
+msgstr "塔"
+
+#: build/trans_presets.java:2631
 msgid "pole"
-msgstr ""
-
-#: build/trans_presets.java:2452
+msgstr "杆"
+
+#: build/trans_presets.java:2632
 msgid "Tower reference"
-msgstr ""
+msgstr "塔编号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "电线"
@@ -27743,76 +28252,76 @@
 #. <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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "编辑电线"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
-msgstr ""
+msgstr "电线类型"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2458
+msgstr "高压线"
+
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
-msgstr ""
+msgstr "低压线"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
-msgstr ""
+msgstr "电缆数"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
-msgstr ""
+msgstr "每根电缆的电线(更好：导体)数"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
-msgstr ""
-
-#: build/trans_presets.java:2464
+msgstr "单根"
+
+#: build/trans_presets.java:2644
 msgid "double"
-msgstr ""
-
-#: build/trans_presets.java:2464
+msgstr "双根"
+
+#: build/trans_presets.java:2644
 msgid "triple"
-msgstr ""
-
-#: build/trans_presets.java:2464
+msgstr "三根"
+
+#: build/trans_presets.java:2644
 msgid "quad"
-msgstr ""
-
-#: build/trans_presets.java:2467
+msgstr "四根"
+
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "便利设施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "厕所"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
-msgstr ""
+msgstr "注释"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "邮筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "电话"
@@ -27821,5 +28330,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "编辑电话"
@@ -27827,5 +28336,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "硬币"
@@ -27833,11 +28342,11 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
-msgstr ""
+msgstr "纸币"
 
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "电子钱包或收费卡"
@@ -27845,21 +28354,21 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
-msgstr ""
+msgstr "借记卡"
 
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "电话卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "资源回收"
@@ -27868,5 +28377,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "资源回收站"
@@ -27874,74 +28383,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "电池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "纸张"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "废金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
-msgstr ""
+msgstr "废纸篓"
 
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
-msgstr ""
+msgstr "编辑废纸篓"
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "材质"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "石头"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "塑胶"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "颜色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "黑色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "浅褐色"
@@ -28020,5 +28529,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28028,63 +28537,63 @@
 msgstr "绿色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "红色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "蓝色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "灰色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "白色"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "座椅数量"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
-msgstr ""
+msgstr "狩猎站"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
-msgstr ""
+msgstr "编辑狩猎站"
 
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "高度"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "低"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "半高"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "全高"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "隐藏"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "锁"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "喷泉"
@@ -28093,10 +28602,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "编辑喷泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "饮水机"
@@ -28105,10 +28614,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "编辑饮水机"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "消防栓"
@@ -28117,5 +28626,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "编辑消防栓"
@@ -28123,5 +28632,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "弃婴保护舱"
@@ -28129,15 +28638,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "编辑弃婴保护舱"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "汽车经销商"
@@ -28145,10 +28654,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "编辑汽车商店"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "自行车经销商"
@@ -28157,28 +28666,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "编辑自行车商店"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "超级市场"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "编辑超级市场"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
-msgstr ""
+msgstr "药店"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2584
+msgstr "编辑药店"
+
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -28186,37 +28695,37 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "编辑便利商店"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
-msgstr ""
+msgstr "售货亭"
 
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
-msgstr ""
-
-#: build/trans_presets.java:2598
+msgstr "编辑售货亭"
+
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "书店"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "编辑书店"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "旅行社"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "编辑旅行社"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "肉类"
@@ -28224,9 +28733,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "编辑肉店"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "面包类"
@@ -28234,9 +28743,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "编辑面包店"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "花类"
@@ -28244,73 +28753,73 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "编辑花店"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "有机产品"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "编辑有机产品商店"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
-msgstr "酒类"
+msgstr "酒"
 
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "编辑卖酒的商店"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
-msgstr "饮料类"
+msgstr "饮料"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "编辑饮料店"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
-msgstr "电脑类"
+msgstr "电脑"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "编辑电脑商店"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "电子材料"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "编辑电子材料行"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "编辑 Hifi 音响店"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
-msgstr "家俱类"
+msgstr "家俱"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "编辑家俱店"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "园艺中心"
@@ -28318,19 +28827,19 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "编辑园艺中心"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
-msgstr "硬体"
+msgstr "硬件"
 
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
-msgstr "编辑硬体商店"
-
-#: build/trans_presets.java:2688
+msgstr "编辑硬件商店"
+
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -28338,64 +28847,64 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "编辑 DIY 商店"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
-msgstr "文具类"
+msgstr "文具"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "编辑文具店"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
-msgstr "美发类"
+msgstr "美发店"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "编辑美发店"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
-msgstr "鞋类"
+msgstr "鞋"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "编辑鞋店"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
-msgstr "玩具类"
+msgstr "玩具"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "编辑玩具店"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
-msgstr "影片类"
+msgstr "影片"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "编辑影片类商店"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
-msgstr "干洗类"
+msgstr "干洗"
 
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "编辑干洗店"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "洗衣店"
@@ -28403,9 +28912,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "编辑洗衣店"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "户外用品"
@@ -28413,24 +28922,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "编辑户外用品店"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "编辑运动用品店"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
-msgstr "眼镜类"
+msgstr "眼镜"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "编辑眼镜行"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "自动贩卖机"
@@ -28438,5 +28947,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "编辑自动贩卖机"
@@ -28444,97 +28953,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "贩卖产品"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
-msgstr ""
-
-#: build/trans_presets.java:2763
+msgstr "公共交通车票"
+
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
-msgstr ""
-
-#: build/trans_presets.java:2763
+msgstr "停车票"
+
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "食物"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "饮料"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "甜点"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "菸"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "相片"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "饲料"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "报纸"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "玩具"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "邮票"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2763
+msgstr "电话券"
+
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "保险套"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "现金"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "银行"
@@ -28542,14 +29051,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "编辑银行"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
-msgstr "自动提款机(ATM)"
+msgstr "自动提款机 (ATM)"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "金钱兑换所"
@@ -28557,5 +29066,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "编辑金钱兑换所"
@@ -28563,15 +29072,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "编辑自动提款机"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "医师"
@@ -28579,18 +29088,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "编辑医师"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "牙医"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "编辑牙医"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "药局"
@@ -28598,5 +29107,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "编辑药局"
@@ -28604,9 +29113,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "配药"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "医院"
@@ -28614,10 +29123,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "编辑医院"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "紧急连络点"
@@ -28626,5 +29135,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "编辑紧急连络点"
@@ -28633,20 +29142,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
 msgstr ""
 
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "电话号码"
-
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用国际码，像是 +12-345-67890)"
@@ -28654,5 +29158,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "兽医"
@@ -28661,64 +29165,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "编辑兽医"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "地理"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr "大洲"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr "编辑大洲"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "国家"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "编辑国家"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr "省/州"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr "编辑省/州"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr "地区"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr "编辑地区"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "县"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "编辑县"
@@ -28726,15 +29230,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "市"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "编辑市"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "镇"
@@ -28742,10 +29246,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "编辑镇"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "郊区"
@@ -28753,25 +29257,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "编辑郊区"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "编辑村"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr "自然村"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr "编辑自然村"
@@ -28779,39 +29283,39 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
-msgstr ""
+msgstr "地区"
 
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
-msgstr ""
+msgstr "编辑地区"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
-msgstr "岛屿"
+msgstr "岛"
 
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
-msgstr "编辑岛屿"
+msgstr "编辑岛"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
-msgstr ""
+msgstr "屿"
 
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
-msgstr ""
+msgstr "编辑屿"
 
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -28819,10 +29323,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "编辑洞窟入口"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "峰"
@@ -28830,10 +29334,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "编辑山峰"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "冰河"
@@ -28841,10 +29345,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "编辑冰河"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "火山"
@@ -28852,70 +29356,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "编辑火山"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "边界"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
-msgstr "国界"
+msgstr "国家"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "编辑国界"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "行政区"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "编辑行政区边界"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
-msgstr "城市的"
+msgstr "城市"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "编辑城市边界"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
-msgstr "政治的"
+msgstr "政治"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
-msgstr "编辑政治的边界"
+msgstr "编辑政治边界"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "国家公园"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "编辑国家公园"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "树"
@@ -28924,40 +29428,40 @@
 #. <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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "编辑树"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "植物学名"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
-msgstr ""
+msgstr "树林"
 
 #. item "Land use/Wood"
 #. <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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
-msgstr ""
+msgstr "编辑树林"
 
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "松类"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "落叶类"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "混合"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "森林"
@@ -28966,14 +29470,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "编辑森林土地利用"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "编辑自然保育"
@@ -28981,95 +29485,95 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
-msgstr ""
+msgstr "碎石坡"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
-msgstr ""
+msgstr "编辑碎石坡"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
-msgstr ""
+msgstr "灌木丛"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
-msgstr ""
+msgstr "编辑灌木丛"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
-msgstr ""
+msgstr "丘陵"
 
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
-msgstr ""
+msgstr "编辑丘陵"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
-msgstr ""
+msgstr "荒地"
 
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
-msgstr ""
+msgstr "编辑荒地"
 
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
-msgstr ""
+msgstr "农家庭院"
 
 #. item "Land use/Farmyard"
 #. <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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
-msgstr ""
+msgstr "编辑农家庭院"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "农田"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
-msgstr "编辑农田土地利用"
+msgstr "编辑农田"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
-msgstr "青草地"
+msgstr "牧场"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
-msgstr "编辑青草地土地利用"
+msgstr "编辑牧场"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
-msgstr ""
+msgstr "葡萄园"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
-msgstr ""
+msgstr "编辑葡萄园"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
-msgstr ""
+msgstr "开心农场(?)"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29077,57 +29581,57 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "花园"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "编辑花园"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
-msgstr ""
+msgstr "编辑草地"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
-msgstr ""
+msgstr "村镇公用绿地"
 
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
-msgstr ""
+msgstr "编辑村镇公用绿地"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
-msgstr ""
+msgstr "公共用地"
 
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
-msgstr ""
+msgstr "编辑公共用地"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "公园"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "编辑公园"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr "游乐场"
@@ -29135,5 +29639,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr "编辑游乐场用地"
@@ -29141,15 +29645,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr "居住区"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr "编辑居住区"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr "墓地(常在教堂附近)"
@@ -29157,9 +29661,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr "编辑墓地"
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr "墓地(不靠近教堂)"
@@ -29167,39 +29671,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr "编辑墓地"
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr "零售"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr "编辑零售用地"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr "商业"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr "编辑商业用地"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "工业"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr "编辑工业用地"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr "铁路用地"
@@ -29207,15 +29711,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr "编辑铁路用地"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
 msgstr "军事"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr "编辑军事用地"
@@ -29223,50 +29727,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr "建筑区"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr "编辑建筑区"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
-msgstr ""
+msgstr "棕色地带(待重新开发的城市用地)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
-msgstr ""
+msgstr "编辑棕色地带"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr "绿地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr "编辑绿地"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr "垃圾填埋场"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr "编辑垃圾填埋场"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr "采石场"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr "编辑采石场"
@@ -29276,5 +29780,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr "编辑多重多边形"
@@ -29286,5 +29790,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr "外围"
@@ -29292,5 +29796,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr "内围"
@@ -29298,5 +29802,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr "边界"
@@ -29307,5 +29811,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr "编辑边界"
@@ -29313,36 +29817,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr "边界类型"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr "行政区界"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr "国界"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr "市界"
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr "政治分界"
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr "行政区界等级"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr "郊区"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr "行政中心"
@@ -29350,5 +29854,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
 msgstr "转弯限制"
@@ -29357,5 +29861,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
 msgstr "编辑转弯限制"
@@ -29363,34 +29867,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr "限制"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr "禁止左转"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr "禁止右转"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr "禁止直行"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr "禁止掉头"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr "只可右转"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr "只可左转"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr "只可直行"
@@ -29399,21 +29903,21 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
-msgstr "from 路径"
+msgstr "出发 路径"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
-msgstr "via 节点或路径"
+msgstr "经过 节点或路径"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
-msgstr "to 路径"
+msgstr "到达 路径"
 
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "路线"
@@ -29422,5 +29926,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "编辑路线"
@@ -29428,5 +29932,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "路线类型"
@@ -29534,5 +30038,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29543,17 +30047,17 @@
 msgstr "单车"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "公交车"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "渡轮"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr "滑雪"
@@ -29621,5 +30125,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29629,9 +30133,9 @@
 msgstr "步行"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "有轨电车"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29645,10 +30149,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "地铁"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29656,31 +30160,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "网络"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
-msgstr ""
+msgstr "路线状况"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
-msgstr ""
-
-#: build/trans_presets.java:3274
+msgstr "建议"
+
+#: build/trans_presets.java:3454
 msgid "alternate"
-msgstr ""
-
-#: build/trans_presets.java:3274
+msgstr "备用"
+
+#: build/trans_presets.java:3454
 msgid "temporary"
-msgstr ""
-
-#: build/trans_presets.java:3274
+msgstr "临时"
+
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "连接"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "颜色(16 进制)"
@@ -29689,30 +30193,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -29791,5 +30295,5 @@
 #: build/trans_style.java:72
 msgid "standard"
-msgstr ""
+msgstr "标准"
 
 #. mappaint style named "standard"
@@ -30324,5 +30828,5 @@
 #: build/trans_style.java:1000 build/trans_style.java:1008
 msgid "highway_track"
-msgstr ""
+msgstr "公路轨迹"
 
 #. color rail
@@ -30414,5 +30918,5 @@
 #: build/trans_style.java:867
 msgid "services"
-msgstr ""
+msgstr "服务"
 
 #. color services
@@ -30426,5 +30930,5 @@
 #: build/trans_style.java:875
 msgid "ford"
-msgstr ""
+msgstr "浅滩"
 
 #. color ford
@@ -30445,5 +30949,5 @@
 #: build/trans_style.java:890
 msgid "turningcircle"
-msgstr ""
+msgstr "回转圈"
 
 #. color construction
@@ -30890,16 +31394,4 @@
 msgstr "机场"
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr "航站楼"
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -31206,5 +31698,5 @@
 #: build/trans_style.java:1618
 msgid "power"
-msgstr ""
+msgstr "塔"
 
 #. color manmade
@@ -31218,5 +31710,5 @@
 #: build/trans_style.java:1667 build/trans_style.java:1668
 msgid "pier"
-msgstr ""
+msgstr "码头"
 
 #. color pier
@@ -32051,5 +32543,5 @@
 #: build/trans_style.java:2599
 msgid "amenity_light"
-msgstr ""
+msgstr "景观灯"
 
 #. color amenity_light
@@ -32825,5 +33317,5 @@
 #: build/trans_style.java:3253 build/trans_style.java:3261
 msgid "basin"
-msgstr ""
+msgstr "水池"
 
 #. color residential
@@ -32963,5 +33455,5 @@
 #: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
-msgstr ""
+msgstr "军事"
 
 #. color military
@@ -32975,5 +33467,5 @@
 #: build/trans_style.java:3375
 msgid "cemetery"
-msgstr ""
+msgstr "墓地(不靠近教堂)"
 
 #. color light_water
@@ -32999,5 +33491,5 @@
 #: build/trans_style.java:3460
 msgid "glacier"
-msgstr ""
+msgstr "冰川"
 
 #. color glacier
@@ -33625,5 +34117,5 @@
 #: build/trans_validator.java:51
 msgid "temporary highway type"
-msgstr ""
+msgstr "临时公路标签"
 
 #. *    : W : highway == road
@@ -33638,10 +34130,10 @@
 #: build/trans_validator.java:58
 msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "带有标签 bicycle 的自行车道"
 
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
-msgstr ""
+msgstr "带有标签 foot 的步道"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -33698,5 +34190,5 @@
 #: build/trans_wms.java:5
 msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
 
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
@@ -33770,5 +34262,5 @@
 #: build/trans_wms.java:33
 msgid "NPE Maps"
-msgstr ""
+msgstr "英国地形测量局新大众版 (NPE) 地图"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
@@ -33825,4 +34317,7 @@
 #~ msgstr "度-分-秒格式"
 
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "缺少 id {0} 对象的合并目标"
+
 #~ msgid "Enter an upload comment (min. 3 characters)"
 #~ msgstr "请输入上传备注(最小3 个字节)"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 22626)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 22628)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 19:03+0200\n"
-"PO-Revision-Date: 2010-07-28 11:24+0000\n"
+"POT-Creation-Date: 2010-08-13 23:23+0200\n"
+"PO-Revision-Date: 2010-08-07 23:29+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-08-04 16:53+0000\n"
+"X-Launchpad-Export-Date: 2010-08-13 20:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -26,6 +26,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:334
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
@@ -121,6 +121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:797
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:799
@@ -229,4 +229,5 @@
 
 #. Strings in JFileChooser
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -238,4 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
@@ -245,5 +247,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -300,5 +302,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
-#: build/specialmessages.java:33
+#: build/specialmessages.java:33 build/specialmessages.java:90
 msgid "Cancel"
 msgstr "取消"
@@ -364,4 +366,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -420,5 +423,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -1366,5 +1369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:302
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
@@ -1429,4 +1432,53 @@
 msgid "Preferences"
 msgstr "偏好設定"
+
+#. translator note: other expressions for "purge" might be "forget", "clean", "obliterate", "prune"
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+#, fuzzy
+msgid "Purge..."
+msgstr "測量員..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:60
+msgid "Forget objects but do not delete them on server when uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Purge"
+msgstr "漢堡"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:162
+#, fuzzy
+msgid "Confirm Purging"
+msgstr "設定外掛程式網站"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:186
+msgid ""
+"This operation makes JOSM forget the selected objects.<br> They will be "
+"removed from the layer, but <i>not</i> deleted<br> on the server when "
+"uploading."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:194
+msgid ""
+"The following dependent objects will be purged<br> in addition to the "
+"selected objects:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:225
+#, fuzzy
+msgid "Add to selection"
+msgstr "加入至選擇區域"
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:239
+msgid ""
+"Some of the objects are modified.<br> Proceed, if these changes should be "
+"discarded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PurgeAction.java:245
+msgid "Clear Undo/Redo buffer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -1468,4 +1520,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
@@ -1699,4 +1752,5 @@
 msgstr "請選擇至少一條路徑來簡化。"
 
+#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1704,4 +1758,5 @@
 #: ../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 "是"
@@ -1748,8 +1803,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:103
-#, fuzzy
 msgid ""
 "The current selection cannot be used for splitting - no node is selected."
-msgstr "不能在選取的節點上切割路徑"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:109
@@ -1886,5 +1940,5 @@
 #, java-format
 msgid "Dupe into {0} nodes"
-msgstr ""
+msgstr "分離為 {0} 個節點"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
@@ -2748,8 +2802,11 @@
 " {0}"
 msgstr ""
+"搜尋表示式無效： \n"
+"\n"
+" {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
 msgid "Invalid search expression"
-msgstr ""
+msgstr "無效的搜尋表示式"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
@@ -2923,4 +2980,5 @@
 
 #. 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
@@ -2950,5 +3008,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:58 build/specialmessages.java:87
 msgid "OK"
 msgstr "確定"
@@ -3038,5 +3096,5 @@
 #, java-format
 msgid "Change relation member role for {0} {1}"
-msgstr ""
+msgstr "改變 {0} {1} 的關係成員角色"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:30
@@ -3155,7 +3213,8 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+#, fuzzy
 msgid ""
 "You are about to delete incomplete objects.<br>This will cause problems "
-"because you don't see the real object.<br>Do you really want to delete?"
+"because you don''t see the real object.<br>Do you really want to delete?"
 msgstr ""
 "您即將刪除不完整的物件。<br>這樣會造成問題，因為您沒有看到實際的物件。<br>您"
@@ -3188,10 +3247,5 @@
 msgstr[0] "移動 {0} 個節點"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr "清理的物件「{0}」"
-
+#: ../core/src/org/openstreetmap/josm/command/PurgeCommand.java:254
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
@@ -3199,4 +3253,10 @@
 msgid_plural "Purged {0} objects"
 msgstr[0] "已清除 {0} 個物件"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "清理的物件「{0}」"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
@@ -3342,30 +3402,30 @@
 #, java-format
 msgid "Unable to create directory {0}, autosave will be disabled"
-msgstr ""
+msgstr "無法建立目錄 {0}，自動儲存將會停用"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:137
 #, java-format
 msgid "Unable to create file {0}, other filename will be used"
-msgstr ""
+msgstr "無法建立檔案 {0}，將使用其他的檔案名稱"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:140
 #, java-format
 msgid "IOError while creating file, autosave will be skipped: {0}"
-msgstr ""
+msgstr "建立檔案時發生 IOError，自動儲存會被略過：{0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:162
 #, java-format
 msgid "Unable to delete old backup file {0}"
-msgstr ""
+msgstr "無法刪除舊的備份檔案 {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:231
 #, java-format
 msgid "Error while creating backup of removed layer: {0}"
-msgstr ""
+msgstr "在建立已移除圖層的備份時發生錯誤：{0}"
 
 #: ../core/src/org/openstreetmap/josm/data/AutosaveTask.java:266
 #, java-format
 msgid "Unable to read autosaved osm data ({0}) - {1}"
-msgstr ""
+msgstr "無法讀取自動儲存的 osm 資料 ({0}) - {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
@@ -3578,5 +3638,5 @@
 msgstr "無法將原型 {0} 加入資料組合，因為它已在其中"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:641
 #, java-format
 msgid ""
@@ -3588,6 +3648,6 @@
 "openstreetmap.de 回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3597,10 +3657,12 @@
 msgstr "缺少 id {0} 路徑的合併目標"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
-#, java-format
-msgid "Missing merge target for object with id {0}"
-msgstr "缺少 id {0} 物件的合併目標"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:181
+#, java-format
+msgid ""
+"Object of type {0} with id {1} was marked to be deleted, but it's missing in "
+"the source dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3608,5 +3670,5 @@
 msgstr "缺少 id {0} 節點的合併目標"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3615,5 +3677,5 @@
 msgstr "缺少 id {0} 關係的合併目標"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3622,4 +3684,12 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "缺少 id {1} 類型 {0} 的合併目標"
+
+#. Same version, but different "visible" attribute. It indicates a serious problem in datasets.
+#. For example, datasets can be fetched from different OSM servers or badly hand-modified.
+#. We shouldn't merge that datasets.
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:314
+#, java-format
+msgid "Conflict in 'visible' attribute for object of type {0} with id {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -3912,5 +3982,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "railway"
 msgstr "鐵路"
@@ -4180,69 +4250,69 @@
 msgstr "密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "options"
 msgstr "選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Show this help"
 msgstr "顯示此說明訊息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Standard unix geometry argument"
 msgstr "標準 unix 幾何引數"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Download the bounding box"
 msgstr "下載此綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "開啟檔案（任何可以使用 檔案/開啟 來開啟的檔案類型）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Download the bounding box as raw gps"
 msgstr "下載綁定方塊做為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "將 url (lat=x&lon=y&zoom=z) 的位置下載為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Select with the given search"
 msgstr "選取指定的搜尋"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid "Launch in maximized mode"
 msgstr "以最大化模式啓動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:94
 msgid "Reset the preferences to default"
 msgstr "重設偏好設定為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:95
 msgid "Set the language"
 msgstr "設定語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "options provided as Java system properties"
 msgstr "選項提供為 Java 系統屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
 msgid "Change the folder for all user settings"
 msgstr "改變所有使用者設定值的資料夾"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4254,9 +4324,9 @@
 "      Java 選項以 MB 來指定分配到記憶體的最大容量"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "examples"
 msgstr "範例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4264,45 +4334,45 @@
 msgstr "參數 --download、 --downloadgps  和 --selection 會以這個順序處理。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Make sure you load some data if you use --selection."
 msgstr "如果您使用 --selection 請確定已載入某些資料。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Initializing"
 msgstr "初始化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:202
 msgid "Updating plugins..."
 msgstr "正在更新外掛程式..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:207
 msgid "Installing updated plugins"
 msgstr "正在安裝更新的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:211
 msgid "Loading early plugins"
 msgstr "載入較早的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
 msgid "Setting defaults"
 msgstr "設定預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:220
 msgid "Creating main GUI"
 msgstr "建立主視窗中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:227
 msgid "Loading plugins"
 msgstr "正在載入外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:247
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:253
 msgid "Unsaved osm data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:248
+msgstr "未儲存的 osm 資料"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:254
 msgid "Restore"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:250
+msgstr "還原"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:256
 #, java-format
 msgid ""
@@ -4310,15 +4380,33 @@
 "time. Do you want to restore data?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:286
+"JOSM 發現 {0} 個未儲存的 osm 資料圖層。看起來上次 JOSM 當機了。您是否要還原資"
+"料？"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:294
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "偏好設定 {0} 已經被移除，因為它已不再使用了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:307
+#, java-format
+msgid ""
+"<h2>JOSM requires Java version 6.</h2>Detected Java version: {0}.<br>You can "
+"<ul><li>update your Java (JRE) or</li><li>use an earlier (Java 5 compatible) "
+"version of JOSM.</li></ul>More Info:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:322
+msgid "Exit JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:323
+msgid "Continue, try anyway"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
 msgid "File"
 msgstr "檔案"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../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
@@ -4337,10 +4425,10 @@
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
 #: build/specialmessages.java:76
 msgid "View"
 msgstr "檢視"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
@@ -4348,5 +4436,5 @@
 msgstr "工具"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:175
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:188
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
@@ -4354,5 +4442,5 @@
 msgstr "預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:209
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:211
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
@@ -4363,5 +4451,5 @@
 msgstr "選單：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:321
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 msgid "Audio"
 msgstr "音效"
@@ -4459,17 +4547,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:758
-#, fuzzy
 msgid "Metric"
-msgstr "數字"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:759
-#, fuzzy
 msgid "Chinese"
-msgstr "中文"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/NavigatableComponent.java:760
-#, fuzzy
 msgid "Imperial"
-msgstr "紀念碑"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
@@ -5181,5 +5266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "all"
 msgstr "全部"
@@ -5623,5 +5708,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57
 msgid "Error in filter"
-msgstr ""
+msgstr "過濾條件發生錯誤"
 
 #. translators notes must be in front
@@ -5827,5 +5912,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:3212
+#: build/trans_presets.java:3392
 msgid "Relations"
 msgstr "關係"
@@ -5919,10 +6004,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select in relation list"
 msgstr "在關係清單中選擇"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
 msgid "Select relation in relation list."
 msgstr "在關係清單中選擇。"
@@ -6521,4 +6606,6 @@
 #. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
 #. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Food Court" label "Edit Food Court"
+#. <key key="amenity" value="food_court" />
 #. item "Food+Drinks/Cafe" label "Edit Cafe"
 #. <key key="amenity" value="cafe" />
@@ -6980,5 +7067,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:176
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 #: build/specialmessages.java:57 build/trans_presets.java:87
 #: build/trans_presets.java:123 build/trans_presets.java:163
@@ -7022,111 +7108,112 @@
 #: build/trans_presets.java:1493 build/trans_presets.java:1513
 #: build/trans_presets.java:1522 build/trans_presets.java:1578
-#: build/trans_presets.java:1595 build/trans_presets.java:1602
-#: build/trans_presets.java:1607 build/trans_presets.java:1613
-#: build/trans_presets.java:1619 build/trans_presets.java:1624
-#: build/trans_presets.java:1630 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1653
-#: build/trans_presets.java:1661 build/trans_presets.java:1668
-#: build/trans_presets.java:1675 build/trans_presets.java:1682
-#: build/trans_presets.java:1689 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1719 build/trans_presets.java:1725
-#: build/trans_presets.java:1732 build/trans_presets.java:1739
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1771 build/trans_presets.java:1790
-#: build/trans_presets.java:1800 build/trans_presets.java:1812
-#: build/trans_presets.java:1819 build/trans_presets.java:1825
-#: build/trans_presets.java:1835 build/trans_presets.java:1840
-#: build/trans_presets.java:1848 build/trans_presets.java:1855
-#: build/trans_presets.java:1861 build/trans_presets.java:1867
-#: build/trans_presets.java:1873 build/trans_presets.java:1878
-#: build/trans_presets.java:1883 build/trans_presets.java:1888
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1951
-#: build/trans_presets.java:1957 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
-#: build/trans_presets.java:2056 build/trans_presets.java:2065
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
-#: build/trans_presets.java:2133 build/trans_presets.java:2139
+#: build/trans_presets.java:1595 build/trans_presets.java:1613
+#: build/trans_presets.java:1630 build/trans_presets.java:1647
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1698 build/trans_presets.java:1715
+#: build/trans_presets.java:1734 build/trans_presets.java:1755
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1809 build/trans_presets.java:1827
+#: build/trans_presets.java:1844 build/trans_presets.java:1861
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1892 build/trans_presets.java:1899
+#: build/trans_presets.java:1905 build/trans_presets.java:1912
+#: build/trans_presets.java:1919 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1951
+#: build/trans_presets.java:1970 build/trans_presets.java:1980
+#: build/trans_presets.java:1992 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2015
+#: build/trans_presets.java:2020 build/trans_presets.java:2028
+#: build/trans_presets.java:2035 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2058 build/trans_presets.java:2063
+#: build/trans_presets.java:2068 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2086
+#: build/trans_presets.java:2095 build/trans_presets.java:2104
+#: build/trans_presets.java:2113 build/trans_presets.java:2122
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 #: build/trans_presets.java:2145 build/trans_presets.java:2151
 #: build/trans_presets.java:2157 build/trans_presets.java:2163
 #: build/trans_presets.java:2169 build/trans_presets.java:2175
 #: build/trans_presets.java:2181 build/trans_presets.java:2187
-#: build/trans_presets.java:2201 build/trans_presets.java:2207
-#: build/trans_presets.java:2213 build/trans_presets.java:2220
-#: build/trans_presets.java:2227 build/trans_presets.java:2235
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2255 build/trans_presets.java:2261
-#: build/trans_presets.java:2267 build/trans_presets.java:2273
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2310 build/trans_presets.java:2342
-#: build/trans_presets.java:2347 build/trans_presets.java:2357
-#: build/trans_presets.java:2362 build/trans_presets.java:2368
-#: build/trans_presets.java:2374 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:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2534 build/trans_presets.java:2541
-#: build/trans_presets.java:2562 build/trans_presets.java:2570
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2588 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2685
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2722
-#: build/trans_presets.java:2729 build/trans_presets.java:2736
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2755 build/trans_presets.java:2780
-#: build/trans_presets.java:2789 build/trans_presets.java:2804
-#: build/trans_presets.java:2810 build/trans_presets.java:2818
-#: build/trans_presets.java:2825 build/trans_presets.java:2845
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2868 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2942
-#: build/trans_presets.java:2948 build/trans_presets.java:2955
-#: build/trans_presets.java:2962 build/trans_presets.java:2971
-#: build/trans_presets.java:2977 build/trans_presets.java:2983
-#: build/trans_presets.java:2989 build/trans_presets.java:2995
-#: build/trans_presets.java:3004 build/trans_presets.java:3014
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3079
-#: build/trans_presets.java:3085 build/trans_presets.java:3091
-#: build/trans_presets.java:3097 build/trans_presets.java:3104
-#: build/trans_presets.java:3110 build/trans_presets.java:3115
-#: build/trans_presets.java:3122 build/trans_presets.java:3129
-#: build/trans_presets.java:3135 build/trans_presets.java:3144
-#: build/trans_presets.java:3152 build/trans_presets.java:3158
-#: build/trans_presets.java:3164 build/trans_presets.java:3171
-#: build/trans_presets.java:3177 build/trans_presets.java:3184
-#: build/trans_presets.java:3190 build/trans_presets.java:3196
-#: build/trans_presets.java:3202 build/trans_presets.java:3208
-#: build/trans_presets.java:3220 build/trans_presets.java:3234
-#: build/trans_presets.java:3253 build/trans_presets.java:3267
+#: build/trans_presets.java:2193 build/trans_presets.java:2199
+#: build/trans_presets.java:2205 build/trans_presets.java:2211
+#: build/trans_presets.java:2217 build/trans_presets.java:2223
+#: build/trans_presets.java:2229 build/trans_presets.java:2236
+#: build/trans_presets.java:2245 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:2313
+#: build/trans_presets.java:2319 build/trans_presets.java:2325
+#: 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:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2393
+#: build/trans_presets.java:2400 build/trans_presets.java:2407
+#: build/trans_presets.java:2415 build/trans_presets.java:2422
+#: build/trans_presets.java:2428 build/trans_presets.java:2435
+#: build/trans_presets.java:2441 build/trans_presets.java:2447
+#: build/trans_presets.java:2453 build/trans_presets.java:2461
+#: build/trans_presets.java:2468 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2490
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2537 build/trans_presets.java:2542
+#: build/trans_presets.java:2548 build/trans_presets.java:2554
+#: build/trans_presets.java:2571 build/trans_presets.java:2577
+#: build/trans_presets.java:2583 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2606
+#: build/trans_presets.java:2613 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2768
+#: build/trans_presets.java:2775 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2801 build/trans_presets.java:2808
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2890 build/trans_presets.java:2896
+#: build/trans_presets.java:2902 build/trans_presets.java:2909
+#: build/trans_presets.java:2916 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2935
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
+#: build/trans_presets.java:2998 build/trans_presets.java:3005
+#: build/trans_presets.java:3025 build/trans_presets.java:3036
+#: build/trans_presets.java:3042 build/trans_presets.java:3048
+#: build/trans_presets.java:3054 build/trans_presets.java:3060
+#: build/trans_presets.java:3067 build/trans_presets.java:3074
+#: build/trans_presets.java:3081 build/trans_presets.java:3087
+#: build/trans_presets.java:3093 build/trans_presets.java:3101
+#: build/trans_presets.java:3108 build/trans_presets.java:3115
+#: build/trans_presets.java:3122 build/trans_presets.java:3128
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3151 build/trans_presets.java:3157
+#: build/trans_presets.java:3163 build/trans_presets.java:3169
+#: build/trans_presets.java:3175 build/trans_presets.java:3184
+#: build/trans_presets.java:3194 build/trans_presets.java:3203
+#: build/trans_presets.java:3209 build/trans_presets.java:3215
+#: build/trans_presets.java:3220 build/trans_presets.java:3226
+#: build/trans_presets.java:3232 build/trans_presets.java:3241
+#: build/trans_presets.java:3247 build/trans_presets.java:3253
+#: build/trans_presets.java:3259 build/trans_presets.java:3265
+#: build/trans_presets.java:3271 build/trans_presets.java:3277
+#: build/trans_presets.java:3284 build/trans_presets.java:3290
+#: build/trans_presets.java:3295 build/trans_presets.java:3302
+#: build/trans_presets.java:3309 build/trans_presets.java:3315
+#: build/trans_presets.java:3324 build/trans_presets.java:3332
+#: build/trans_presets.java:3338 build/trans_presets.java:3344
+#: build/trans_presets.java:3351 build/trans_presets.java:3357
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3388 build/trans_presets.java:3400
+#: build/trans_presets.java:3414 build/trans_presets.java:3433
+#: build/trans_presets.java:3447
 msgid "Name"
 msgstr "名稱"
@@ -8036,5 +8123,5 @@
 "Members from paste buffer cannot be added because they are not included in "
 "current layer"
-msgstr ""
+msgstr "不能加入來自貼上緩衝區的成員，因為它們不包含在目前的圖層裡"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
@@ -8184,21 +8271,25 @@
 msgstr "重新命名目前選取的書籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:105
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:107
 msgid "min lon"
 msgstr "最小經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "max lon"
 msgstr "最大經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+msgid "Clear textarea"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:123
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -8206,10 +8297,10 @@
 msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上 URL 下載該區域)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:155
 msgid "Bounding Box"
 msgstr "綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:229
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:261
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
@@ -8218,15 +8309,15 @@
 msgstr "字串「{0}」不是一個合格的 double 數值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:233
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
 msgid "Value for latitude in range [-90,90] required."
 msgstr "緯度的數值範圍必須為 [-90,90]。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:265
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
 msgid "Value for longitude in range [-180,180] required."
 msgstr "經度的數值範圍必須為 [-180,180]。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:304
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
 msgid "Paste URL from clipboard"
@@ -8375,8 +8466,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2382 build/trans_presets.java:2416
-#: build/trans_presets.java:2425 build/trans_presets.java:2451
-#: build/trans_presets.java:3005 build/trans_presets.java:3015
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:2562 build/trans_presets.java:2596
+#: build/trans_presets.java:2605 build/trans_presets.java:2631
+#: build/trans_presets.java:3185 build/trans_presets.java:3195
+#: build/trans_presets.java:3204
 msgid "Type"
 msgstr "類型"
@@ -8405,6 +8496,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
+#: build/trans_presets.java:1375 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
 msgid "unknown"
 msgstr "不明"
@@ -8812,7 +8903,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:51
-#, fuzzy
 msgid "Enter an upload comment"
-msgstr "不合格的上傳註解"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
@@ -9007,7 +9097,9 @@
 msgstr "選擇檔案名稱"
 
+#. 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 "否"
@@ -9046,5 +9138,5 @@
 #, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr ""
+msgstr "圖層「{0}」尚未以檔案備份"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
@@ -9316,17 +9408,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:370
-#, fuzzy
 msgid "Please revise upload comment"
-msgstr "不合格的上傳註解"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Revise"
-msgstr "反轉"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:371
-#, fuzzy
 msgid "Continue as is"
-msgstr "繼續"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
@@ -9344,7 +9433,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:389
-#, fuzzy
 msgid "Cancel and return to the previous dialog"
-msgstr "取消並回到編輯器"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:390
@@ -9353,7 +9441,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:393
-#, fuzzy
 msgid "Do not show this message again"
-msgstr "不要再次顯示這個訊息"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:401
@@ -9547,5 +9634,5 @@
 msgstr[0] "正在上傳 {0} 個物件..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:289
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
@@ -9728,5 +9815,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3270
+#: build/trans_presets.java:3450
 msgid "Description"
 msgstr "描述"
@@ -10605,9 +10692,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
 msgid "Consumer Key:"
-msgstr ""
+msgstr "消費方金鑰："
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
 msgid "Consumer Secret:"
-msgstr ""
+msgstr "消費方密鑰："
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
@@ -11393,5 +11480,5 @@
 msgstr "顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
@@ -11402,35 +11489,35 @@
 msgstr "全部"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 msgid "Local files"
 msgstr "本地端檔案"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "None"
 msgstr "沒有"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
 msgid "Force lines if no segments imported."
 msgstr "如果沒有匯入區段時強制繪出的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
 msgid "Draw large GPS points."
 msgstr "繪出大型 GPS 點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:159
 msgid "Draw a circle form HDOP value."
 msgstr "從 HDOP 數值繪製圓形。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速率（紅 = 慢，綠 = 快）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "單一顏色（可以為已命名的圖層自訂）"
@@ -11438,5 +11525,5 @@
 #. item "Aerialway/Pylon" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:1332
 msgid "Car"
@@ -11458,5 +11545,5 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:387 build/trans_presets.java:497
 #: build/trans_presets.java:754 build/trans_presets.java:773
@@ -11498,5 +11585,5 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: build/trans_presets.java:388 build/trans_presets.java:496
 #: build/trans_presets.java:753 build/trans_presets.java:772
@@ -11510,64 +11597,70 @@
 msgstr "步行"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "繪出方向箭頭"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "快速繪製（看起來較醜）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "只有重要的方向提示（例如單行道標籤）。"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:249
 msgid "Only on the head of a way."
 msgstr "只在路徑的開頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "繪製區段順序編號"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "繪出已下載資料的邊界"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "在選擇模式繪出虛擬節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "將未使用的圖層以其他顏色繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "平滑化地圖圖片（反鉅齒）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
 msgid "Create markers when reading GPX."
 msgstr "讀取 GPX 時建立標記。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
 msgid "Auto"
-msgstr "作者"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-msgid "Desc"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
-#, fuzzy
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:62
+msgctxt "gpx_field"
+msgid "Name"
+msgstr ""
+
+#. gpx data field name
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
+msgctxt "gpx_field"
+msgid "Desc(ription)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:63
 msgid "Both"
-msgstr "小船"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
 msgid ""
 "Automatically make a marker layer from any waypoints when opening a GPX "
@@ -11575,9 +11668,9 @@
 msgstr "開啟 GPX 圖層時自動從任何航點製作標記圖層。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:92
 msgid "Draw lines between raw GPS points"
 msgstr "在原始 GPS 點之間繪出線條"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
@@ -11585,34 +11678,34 @@
 msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
 msgid "Maximum length for local files (meters)"
 msgstr "本地端檔案最大長度（公尺）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
 msgid ""
 "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
 msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:123
 msgid "Maximum length (meters)"
 msgstr "最大長度（公尺）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "如果匯入的資料不含線條資訊，仍強制繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:139
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "繪出線條的方向箭頭，連接 GPS 點。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
 msgid ""
 "Do not draw arrows if they are not at least this distance away from the last "
@@ -11620,13 +11713,13 @@
 msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（像素）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:164
 msgid "Draw larger dots for the GPS points."
 msgstr "將 GPS 點以較大的點繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -11634,9 +11727,9 @@
 msgstr "所有的點和軌跡區段都使用同樣的顏色。可以在圖層管理程式自訂。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Colors points and track segments by velocity."
 msgstr "依速度來為點和軌跡區段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -11644,55 +11737,54 @@
 msgstr "為地點精度 (HDOP) 的點和軌跡區段上色。您的捕捉裝置需要能記錄這項資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:198
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "允許依不同的平均速度調整軌跡顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:201
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
 msgid "Track and Point Coloring"
 msgstr "軌跡與點的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:211
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:213
 msgid "Allows to change the labelling of track waypoints."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
 msgid "Waypoint labelling"
-msgstr "航點描述"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:218
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "GPS Points"
 msgstr "GPS 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
 msgid "Draw direction hints for way segments."
 msgstr "繪出路徑區段的方向提示。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:255
 msgid "Draw the order numbers of all segments within their way."
 msgstr "繪出所有區段在其路徑中的順序編號。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:260
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "繪出從伺服器下載資料的邊界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:268
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:270
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:273
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:275
 msgid "Draw the inactive data layers in a different color."
 msgstr "將未使用的資料圖層以不同的顏色繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:282
 msgid "OSM Data"
 msgstr "OSM 資料"
@@ -12062,7 +12154,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:153
-#, fuzzy
 msgid "System of measurement"
-msgstr "要進行測量的圖層"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
@@ -12687,5 +12778,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:767
 msgid "Preset role element without parent"
-msgstr ""
+msgstr "沒有父項的預設組合角色元素"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
@@ -12747,21 +12838,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Search preset"
-msgstr ""
+msgstr "搜尋預設組合"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:16
 msgid "Show preset search dialog"
-msgstr ""
+msgstr "顯示預設組合對話盒"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchAction.java:17
 msgid "Search presets"
-msgstr ""
+msgstr "搜尋預設組合"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:263
 msgid "Show only applicable to selection"
-msgstr ""
+msgstr "只顯示適合選擇區域"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:280
 msgid "Search in tags"
-msgstr ""
+msgstr "搜尋標籤"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
@@ -12937,5 +13028,5 @@
 msgstr "正在分析伺服器的回應..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:170
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:172
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
@@ -14563,5 +14654,5 @@
 "<br><br>錯誤的訊息為：<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:447
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:453
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -14588,5 +14679,5 @@
 msgstr "嚴重的錯誤：無法定位圖片「{0}」。這是嚴重的組態問題。JOSM 會停止運作。"
 
-#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:26
 #, java-format
 msgid ""
@@ -14836,15 +14927,15 @@
 #: ../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:2330
+#: build/trans_presets.java:2510
 msgid "Address Interpolation"
-msgstr ""
+msgstr "地址填寫"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 msgid "Handy Address Interpolation Functions"
-msgstr ""
+msgstr "便利住址填寫功能"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
 msgid "Define Address Interpolation"
-msgstr ""
+msgstr "定義地址填寫"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
@@ -15262,5 +15353,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
 msgid "Big buildings mode"
-msgstr ""
+msgstr "大型建築模式"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
@@ -15270,9 +15361,9 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
 msgid "Advanced settings"
-msgstr ""
+msgstr "進階設定"
 
 #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
 msgid "Building tag:"
-msgstr ""
+msgstr "建築物標籤："
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:234
@@ -15297,5 +15388,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:28
 msgid "Auto-select building"
-msgstr ""
+msgstr "自動選擇建築物"
 
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45
@@ -15309,5 +15400,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:55
 msgid "Advanced..."
-msgstr ""
+msgstr "進階..."
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65
@@ -15318,30 +15409,30 @@
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379
 msgid "Point on the corner of the building to start drawing"
-msgstr ""
+msgstr "點選要開始繪製建築物的角落"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381
 msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "點選建築物相對的結束點"
 
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383
 msgid "Set width of the building"
-msgstr ""
+msgstr "設定建築物的寬度"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
 msgid "on polygon"
-msgstr ""
+msgstr "於多邊形"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
 msgid "Add address"
-msgstr ""
+msgstr "加入地址"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
 msgid "Helping tool for tag address"
-msgstr ""
+msgstr "標籤位址的協助工具"
 
 #. group "Man-Made"
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2373
 msgid "Buildings"
 msgstr "建築物"
@@ -15349,5 +15440,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:431
 msgid "Next no"
-msgstr ""
+msgstr "下一個在"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:432
@@ -15358,5 +15449,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:473
 msgid "Enter addresses"
-msgstr ""
+msgstr "編輯地址"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
@@ -15538,5 +15629,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
 msgid "Don't use relation for addresses (but \"addr:street\" on elements)."
-msgstr ""
+msgstr "不使用住址的關係（除了元素 \"addr:street\"）。"
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15592,5 +15683,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2382 build/trans_style.java:1018
+#: build/trans_presets.java:2562 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
@@ -15747,5 +15838,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
 msgid "Image filter interpolation:"
-msgstr ""
+msgstr "圖片過濾條件插補："
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
@@ -15850,5 +15941,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:348
 msgid "Enable this to use the tag \"add:street\" on nodes."
-msgstr ""
+msgstr "啟用這個選項來使用節點的 \"add:street\" 標籤。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
@@ -16259,32 +16350,32 @@
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:55
 msgid "Download along..."
-msgstr ""
+msgstr "沿線下載..."
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:56
 msgid "Download OSM data along the selected ways."
-msgstr ""
+msgstr "沿著選取的路徑下載 OSM 資料。"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:58
 msgid "Download Along"
-msgstr ""
+msgstr "沿線下載"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:74
 msgid "Please select 1 or more ways to download along"
-msgstr ""
+msgstr "請選擇 1 或多個路徑以沿線下載"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:167
 #, java-format
 msgid "{0} intermediate nodes to download."
-msgstr ""
+msgstr "下要載 {0} 個中間的節點。"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:168
 #, java-format
 msgid "between {0} {1} and {2} {3}"
-msgstr ""
+msgstr "在 {0} {1} 和 {2} {3} 之間"
 
 #: ../plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java:172
 #, java-format
 msgid "  adding {0} {1}"
-msgstr ""
+msgstr "  正在加入 {0} {1}"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -16354,13 +16445,13 @@
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188
 msgid "Child script have returned invalid data."
-msgstr ""
+msgstr "子命令稿傳回了無效的資料。"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
 msgid "Edit tool"
-msgstr ""
+msgstr "編輯工具"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54
 msgid "Name:"
-msgstr ""
+msgstr "名稱："
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:55
@@ -16370,5 +16461,5 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26
 msgid "External tools"
-msgstr ""
+msgstr "外部工具"
 
 #. Plugin ext_tools
@@ -16376,10 +16467,10 @@
 #: build/trans_plugins.java:26
 msgid "Use external scripts in JOSM"
-msgstr ""
+msgstr "使用 JOSM 外部命令稿"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:73
 #, java-format
 msgid "Delete tool \"{0}\"?"
-msgstr ""
+msgstr "是否刪除工具「{0}」？"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74
@@ -16389,9 +16480,9 @@
 #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91
 msgid "New tool..."
-msgstr ""
+msgstr "新增工具..."
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54
 msgid "Install"
-msgstr ""
+msgstr "安裝"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
@@ -17568,7 +17659,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "read protocol version"
-msgstr "合併的版本"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -17709,37 +17799,37 @@
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
 msgid "Road Sign Plugin"
-msgstr ""
+msgstr "路標外掛程式"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
 msgid "Roadsign tagging"
-msgstr ""
+msgstr "路標的標籤"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53
 msgid "Add tags by clicking on road signs"
-msgstr ""
+msgstr "點選路標加入標籤"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:54
 msgid "Roadsigns plugin: open dialog"
-msgstr ""
+msgstr "Roadsigns 外掛程式：開啟對話盒"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:89
 #, java-format
 msgid "Could not read tagging preset source: ''{0}''"
-msgstr ""
+msgstr "無法讀取標籤預設組合來源：「{0}」"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:97
 #, java-format
 msgid "Error parsing tagging preset from ''{0}'':\n"
-msgstr ""
+msgstr "從「{0}」解析標籤預設組合時發生錯誤：\n"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:108
 #, java-format
 msgid "Sign {0}"
-msgstr ""
+msgstr "路標 {0}"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java:115
 #, java-format
 msgid "Additional sign {0}"
-msgstr ""
+msgstr "額外路標 {0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17849,9 +17939,9 @@
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
 msgid "Simplify Area"
-msgstr ""
+msgstr "簡化區域"
 
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41
 msgid "Delete unnecessary nodes from an area."
-msgstr ""
+msgstr "刪除區域中不必要的節點。"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:138
@@ -18189,13 +18279,13 @@
 msgstr "連棟建築"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-msgid "SeaMap Symbol Entry"
-msgstr ""
-
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:179
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:181
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
 #, fuzzy
+msgid "Edit SeaMap Symbols"
+msgstr "編輯鞋店"
+
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:170
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:172
 msgid "Seamark Editor"
-msgstr "分隔線"
+msgstr ""
 
 #: ../plugins/touchscreenhelper/src/touchscreenhelper/BrowseAction.java:19
@@ -18756,4 +18846,7 @@
 "the way with role <tt>to</tt>, though."
 msgstr ""
+"這個轉彎限制使用的 OSM 路徑 <span class=\"object-name\">{0}</span> 具有角色 "
+"<tt>from</tt> <strong>和</strong>角色 <tt>to</tt>。但是，在轉彎限制中，具有角"
+"色 <tt>from</tt> 的路徑和角色 <tt>to</tt> 的路徑不能是同一條。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
@@ -18813,4 +18906,9 @@
 "object."
 msgstr ""
+"<strong>from</strong>-路徑 <span class=\"object-name\">{0}</span> 和 "
+"<strong>to</strong>-路徑 <span class=\"object-name\">{1}</span> 在節點 <span "
+"class=\"object-name\">{2}</span> 相交叉，但是 <span class=\"object-name\">{2}"
+"</span> 並不是 <strong>via</strong>-物件。<br> 建議將 <span class=\"object-"
+"name\">{2}</span> 設定為獨一的 <strong>via</strong>-物件。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
@@ -18822,5 +18920,5 @@
 "Replaces the currently configured via-objects with the node at the "
 "intersection"
-msgstr ""
+msgstr "把交叉點的節點取代為目前設定的 via-物件"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
@@ -18836,13 +18934,13 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
 msgid "An OSM way with role <tt>from</tt> is required in a turn restriction."
-msgstr ""
+msgstr "在轉彎限制中需要角色為 <tt>from</tt> 的 OSM 路徑。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
 msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-msgstr ""
+msgstr "在轉彎限制中需要角色為 <tt>to</tt> 的 OSM 路徑。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
 msgid "Please go to the Basic editor and manually choose an OSM way."
-msgstr ""
+msgstr "請移至基本編輯器並手動選擇 OSM 路徑。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
@@ -18852,9 +18950,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
 msgid "Add an OSM way with role ''from''"
-msgstr ""
+msgstr "加入角色為「from」的 OSM 路徑"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54
 msgid "Add an OSM way with role ''to''"
-msgstr ""
+msgstr "加入角色為「to」的 OSM 路徑"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
@@ -18864,4 +18962,6 @@
 "turn restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"轉彎限制需要唯一且角色為 <tt>from</tt> 的路徑。這個轉彎限制卻有 {0} 條路徑是"
+"這個角色。請移除它們中的 {1}。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
@@ -18871,4 +18971,6 @@
 "restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"轉彎限制需要唯一且角色為 <tt>to</tt> 的路徑。這個轉彎限制卻有 {0} 條路徑是這"
+"個角色。請移除它們中的 {1}。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
@@ -18911,4 +19013,7 @@
 "connects to way <span class=\"object-name\">{3}</span>."
 msgstr ""
+"角色為 <tt>{1}</tt> 的 OSM 路徑 <span class=\"object-name\">{0}</span>應該從"
+"它連接到路徑 <span class=\"object-name\">{3}</span> 的節點 <span class="
+"\"object-name\">{2}</span> 處分離。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
@@ -19169,5 +19274,5 @@
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "正在修正 ({0}/{1})：「{2}」"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:507
@@ -19242,21 +19347,21 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:170
 msgid "Mixed type duplicated nodes"
-msgstr ""
+msgstr "混合類型的重複節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:181
 msgid "Highway duplicated nodes"
-msgstr ""
+msgstr "道路有重複的節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:192
 msgid "Railway duplicated nodes"
-msgstr ""
+msgstr "鐵路有重複的節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:203
 msgid "Waterway duplicated nodes"
-msgstr ""
+msgstr "水路有重複的節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:214
 msgid "Boundary duplicated nodes"
-msgstr ""
+msgstr "邊界有重複的節點"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:225
@@ -19297,5 +19402,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3393
 msgid "Multipolygon"
 msgstr "多重多邊形"
@@ -19860,5 +19965,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68
 msgid "No tags"
-msgstr ""
+msgstr "沒有標籤"
 
 #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
@@ -19868,30 +19973,30 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109
 msgid "Unconnected nodes without physical tags"
-msgstr ""
+msgstr "未連接且沒有實體標籤的節點"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
 msgid "Has tag containing ''fixme'' or ''FIXME''"
-msgstr ""
+msgstr "使用的標籤含有「fixme」或「FIXME」"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87
 msgid "Has key ''note'' or ''comment'' or ''description''"
-msgstr ""
+msgstr "具有設定鍵 ''note'' 或 ''comment'' 或 ''description''"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
 msgid "Has key ''created_by'' or ''converted_by''"
-msgstr ""
+msgstr "具有設定鍵 ''created_by'' 或 ''converted_by''"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
 msgid "Has key ''watch''"
-msgstr ""
+msgstr "具有設定鍵 ''watch''"
 
 #. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
 msgid "Has key ''source''"
-msgstr ""
+msgstr "具有設定鍵 ''source''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62
@@ -19913,5 +20018,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
 msgid "Untagged ways (commented)"
-msgstr ""
+msgstr "未加標籤路徑 (有註解)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
@@ -19955,5 +20060,5 @@
 #, java-format
 msgid "{0} {1}% of GPS track"
-msgstr ""
+msgstr "{0} {1}% 的 GPS 軌跡"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:88
@@ -19963,29 +20068,29 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
 msgid "Import Video"
-msgstr ""
+msgstr "匯入影片"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113
 msgid "Sync a video against this GPS track"
-msgstr ""
+msgstr "將影片與這個 GPS 軌跡同步"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
 msgid "Remove Video"
-msgstr ""
+msgstr "移除影片"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137
 msgid "removes current video from layer"
-msgstr ""
+msgstr "將目前的影片從圖層中移除"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
 msgid "play/pause"
-msgstr ""
+msgstr "播放/暫停"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144
 msgid "starts/pauses video playback"
-msgstr ""
+msgstr "開始/暫停影片的播放"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
 msgid "backward"
-msgstr ""
+msgstr "倒轉"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151
@@ -19995,5 +20100,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
 msgid "forward"
-msgstr ""
+msgstr "快轉"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159
@@ -20003,35 +20108,35 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
 msgid "faster"
-msgstr ""
+msgstr "加速"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167
 msgid "faster playback"
-msgstr ""
+msgstr "加速播放"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175
 msgid "slower"
-msgstr ""
+msgstr "減速"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175
 msgid "slower playback"
-msgstr ""
+msgstr "減速播放"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:102
 msgid "loop"
-msgstr ""
+msgstr "循環"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183
 msgid "loops n sec around current position"
-msgstr ""
+msgstr "在目前的地點循環播放 n 秒"
 
 #. now the options menu
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193
 msgid "Keep centered"
-msgstr ""
+msgstr "保持置中"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193
 msgid "follows the video icon automaticly"
-msgstr ""
+msgstr "自動跟隨影片圖示"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203
@@ -20052,13 +20157,13 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218
 msgid "Loop length"
-msgstr ""
+msgstr "循環長度"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214
 msgid "Set the length around a looppoint"
-msgstr ""
+msgstr "設定循環點的長度"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227
 msgid "no deinterlacing"
-msgstr ""
+msgstr "沒有非交錯式"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:235
@@ -20072,13 +20177,13 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99
 msgid "play"
-msgstr ""
+msgstr "播放"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131
 msgid "Unable to find JNA Java library!"
-msgstr ""
+msgstr "找不到 JNA Java 程式庫！"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:135
 msgid "Unable to find native libvlc library!"
-msgstr ""
+msgstr "找不到原生 libvlc 程式庫！"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -20182,5 +20287,5 @@
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:46
 msgid "Select non-branching sequences of ways"
-msgstr ""
+msgstr "選擇路徑的非分支次序"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
@@ -20275,5 +20380,5 @@
 "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
 "or a trailing '?'."
-msgstr ""
+msgstr "警告：WMS 服務的基礎 URL「{0}」缺少「&」或「?」。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
@@ -20458,5 +20563,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186
 msgid "Simultaneous connections"
-msgstr ""
+msgstr "同時連線"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -20534,5 +20639,5 @@
 msgctxt "Relation type"
 msgid "associatedStreet"
-msgstr ""
+msgstr "關聯的街道"
 
 #. relation type
@@ -20558,5 +20663,5 @@
 msgctxt "Relation type"
 msgid "multipolygon"
-msgstr ""
+msgstr "多重多邊形"
 
 #. relation type
@@ -20564,5 +20669,5 @@
 msgctxt "Relation type"
 msgid "network"
-msgstr ""
+msgstr "網路"
 
 #. relation type
@@ -20570,5 +20675,5 @@
 msgctxt "Relation type"
 msgid "public_transport"
-msgstr ""
+msgstr "大眾運輸"
 
 #. relation type
@@ -20576,5 +20681,5 @@
 msgctxt "Relation type"
 msgid "restriction"
-msgstr ""
+msgstr "限制"
 
 #. relation type
@@ -20594,5 +20699,5 @@
 msgctxt "Relation type"
 msgid "waterway"
-msgstr ""
+msgstr "水路"
 
 #. Strings in JFileChooser
@@ -20609,5 +20714,5 @@
 #: build/specialmessages.java:31
 msgid "Abort file chooser dialog"
-msgstr ""
+msgstr "中止檔案選擇對話盒"
 
 #. Strings in JFileChooser
@@ -20720,5 +20825,5 @@
 #: build/specialmessages.java:60
 msgid "Open selected file"
-msgstr ""
+msgstr "開啟選取的檔案"
 
 #. Strings in JFileChooser
@@ -20819,4 +20924,6 @@
 "option to automatically generate individual house number nodes from a Way."
 msgstr ""
+"以單一對話盒進行群組通用地址填寫的輸入，同時也可以選擇自動從路徑產生個別門牌"
+"號碼節點。"
 
 #. File ../plugins/alignways/build.xml had no data
@@ -20872,5 +20979,5 @@
 #: build/trans_plugins.java:20
 msgid "Downloads OSM data along a way"
-msgstr ""
+msgstr "沿路徑下載 OSM 資料"
 
 #. Plugin Duplicate-Way
@@ -21024,4 +21131,6 @@
 "properties window. Available country presets: Germany."
 msgstr ""
+"基於路標的選擇區域為物件加上標籤的外掛程式。這個對話盒可以在屬性視窗的右上角"
+"點選小圖示來開啟。可用的國家預設組合：德國。"
 
 #. Plugin routes
@@ -21045,4 +21154,6 @@
 "constrained by maximum removed area size. Also average nearby nodes."
 msgstr ""
+"藉由移除屬於很鈍的鈍角的節點來簡化區域。這可以使用最大移除區域大小來限制。同"
+"時也會平均化附近的節點。"
 
 #. Plugin slippymap
@@ -21148,5 +21259,5 @@
 #: build/trans_plugins.java:106
 msgid "Select a sequence of non-branching connected ways"
-msgstr ""
+msgstr "選擇非分支連接的路徑次序"
 
 #. Plugin wms-turbo-challenge2
@@ -21289,5 +21400,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2435 build/trans_presets.java:3268
+#: build/trans_presets.java:2615 build/trans_presets.java:3448
 msgid "Reference"
 msgstr "道路編號"
@@ -21826,5 +21937,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "metal"
 msgstr "金屬"
@@ -21837,5 +21948,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2517
+#: build/trans_presets.java:1254 build/trans_presets.java:2697
 msgid "wood"
 msgstr "木頭"
@@ -21850,5 +21961,5 @@
 #: build/trans_presets.java:1254
 msgid "paving_stones"
-msgstr ""
+msgstr "鋪路石"
 
 #: build/trans_presets.java:264 build/trans_presets.java:282
@@ -21970,5 +22081,5 @@
 #: build/trans_presets.java:304
 msgid "Service"
-msgstr "巷/弄(Service)"
+msgstr "服務型(Service)"
 
 #. item "Highways/Streets/Service"
@@ -21977,5 +22088,5 @@
 #: build/trans_presets.java:307
 msgid "Edit Serviceway"
-msgstr "編輯巷/弄"
+msgstr "編輯服務型道路"
 
 #. item "Highways/Streets/Service" label "Edit Serviceway"
@@ -21985,5 +22096,5 @@
 #: build/trans_presets.java:311
 msgid "Serviceway type"
-msgstr "巷/弄道路類型"
+msgstr "服務型道路類型"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
@@ -22113,4 +22224,66 @@
 #. item "Public Transport/Bus Stop" combo "Bench"
 #. item "Public Transport/Bus Stop" combo "Tactile Paving"
+#. item "Travel/Accomodation/Hotel" combo "Internet access"
+#. item "Travel/Accomodation/Hotel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hotel" combo "Smoking"
+#. item "Travel/Accomodation/Hotel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Motel" combo "Internet access"
+#. item "Travel/Accomodation/Motel" combo "Internet access fee"
+#. item "Travel/Accomodation/Motel" combo "Smoking"
+#. item "Travel/Accomodation/Motel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Guest House" combo "Internet access"
+#. item "Travel/Accomodation/Guest House" combo "Internet access fee"
+#. item "Travel/Accomodation/Guest House" combo "Smoking"
+#. item "Travel/Accomodation/Guest House" combo "Wheelchairs"
+#. item "Travel/Accomodation/Chalet" combo "Internet access"
+#. item "Travel/Accomodation/Chalet" combo "Internet access fee"
+#. item "Travel/Accomodation/Chalet" combo "Smoking"
+#. item "Travel/Accomodation/Chalet" combo "Wheelchairs"
+#. item "Travel/Accomodation/Hostel" combo "Internet access"
+#. item "Travel/Accomodation/Hostel" combo "Internet access fee"
+#. item "Travel/Accomodation/Hostel" combo "Smoking"
+#. item "Travel/Accomodation/Hostel" combo "Wheelchairs"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access"
+#. item "Travel/Accomodation/Alpine Hut" combo "Internet access fee"
+#. item "Travel/Accomodation/Alpine Hut" combo "Smoking"
+#. item "Travel/Accomodation/Alpine Hut" combo "Wheelchairs"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access"
+#. item "Travel/Accomodation/Caravan Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Caravan Site" combo "Smoking"
+#. item "Travel/Accomodation/Caravan Site" combo "Wheelchairs"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access"
+#. item "Travel/Accomodation/Camping Site" combo "Internet access fee"
+#. item "Travel/Accomodation/Camping Site" combo "Smoking"
+#. item "Travel/Accomodation/Camping Site" combo "Wheelchairs"
+#. item "Food+Drinks/Restaurant" combo "Internet access"
+#. item "Food+Drinks/Restaurant" combo "Internet access fee"
+#. item "Food+Drinks/Restaurant" combo "Smoking"
+#. item "Food+Drinks/Restaurant" combo "Wheelchairs"
+#. item "Food+Drinks/Fast Food" combo "Internet access"
+#. item "Food+Drinks/Fast Food" combo "Internet access fee"
+#. item "Food+Drinks/Fast Food" combo "Smoking"
+#. item "Food+Drinks/Fast Food" combo "Wheelchairs"
+#. item "Food+Drinks/Food Court" combo "Internet access"
+#. item "Food+Drinks/Food Court" combo "Internet access fee"
+#. item "Food+Drinks/Food Court" combo "Smoking"
+#. item "Food+Drinks/Food Court" combo "Wheelchairs"
+#. item "Food+Drinks/Cafe" combo "Internet access"
+#. item "Food+Drinks/Cafe" combo "Internet access fee"
+#. item "Food+Drinks/Cafe" combo "Smoking"
+#. item "Food+Drinks/Cafe" combo "Wheelchairs"
+#. item "Food+Drinks/Pub" combo "Internet access"
+#. item "Food+Drinks/Pub" combo "Internet access fee"
+#. item "Food+Drinks/Pub" combo "Smoking"
+#. item "Food+Drinks/Pub" combo "Wheelchairs"
+#. item "Food+Drinks/Biergarten" combo "Internet access"
+#. item "Food+Drinks/Biergarten" combo "Internet access fee"
+#. item "Food+Drinks/Biergarten" combo "Smoking"
+#. item "Food+Drinks/Biergarten" combo "Wheelchairs"
+#. item "Food+Drinks/Bar" combo "Internet access"
+#. item "Food+Drinks/Bar" combo "Internet access fee"
+#. item "Food+Drinks/Bar" combo "Smoking"
+#. item "Food+Drinks/Bar" combo "Wheelchairs"
+#. item "Food+Drinks/Nightclub" combo "Smoking"
+#. item "Food+Drinks/Nightclub" combo "Wheelchairs"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -22139,9 +22312,40 @@
 #: build/trans_presets.java:1374 build/trans_presets.java:1375
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
-#: build/trans_presets.java:1496 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
-#: build/trans_presets.java:2475 build/trans_presets.java:2516
-#: build/trans_presets.java:2525 build/trans_presets.java:2526
-#: build/trans_presets.java:2527 build/trans_presets.java:2817
+#: build/trans_presets.java:1496 build/trans_presets.java:1599
+#: build/trans_presets.java:1600 build/trans_presets.java:1601
+#: build/trans_presets.java:1602 build/trans_presets.java:1617
+#: build/trans_presets.java:1618 build/trans_presets.java:1619
+#: build/trans_presets.java:1620 build/trans_presets.java:1633
+#: build/trans_presets.java:1634 build/trans_presets.java:1635
+#: build/trans_presets.java:1636 build/trans_presets.java:1650
+#: build/trans_presets.java:1651 build/trans_presets.java:1652
+#: build/trans_presets.java:1653 build/trans_presets.java:1668
+#: build/trans_presets.java:1669 build/trans_presets.java:1670
+#: build/trans_presets.java:1671 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1701
+#: build/trans_presets.java:1702 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1718
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1741
+#: build/trans_presets.java:1742 build/trans_presets.java:1743
+#: build/trans_presets.java:1744 build/trans_presets.java:1760
+#: build/trans_presets.java:1761 build/trans_presets.java:1762
+#: build/trans_presets.java:1763 build/trans_presets.java:1777
+#: build/trans_presets.java:1778 build/trans_presets.java:1779
+#: build/trans_presets.java:1780 build/trans_presets.java:1795
+#: build/trans_presets.java:1796 build/trans_presets.java:1797
+#: build/trans_presets.java:1798 build/trans_presets.java:1814
+#: build/trans_presets.java:1815 build/trans_presets.java:1816
+#: build/trans_presets.java:1817 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1832
+#: build/trans_presets.java:1833 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:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
+#: build/trans_presets.java:2655 build/trans_presets.java:2696
+#: build/trans_presets.java:2705 build/trans_presets.java:2706
+#: build/trans_presets.java:2707 build/trans_presets.java:2997
 msgid "yes"
 msgstr "是"
@@ -22251,9 +22455,40 @@
 #: build/trans_presets.java:1375 build/trans_presets.java:1494
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:2474 build/trans_presets.java:2475
-#: build/trans_presets.java:2516 build/trans_presets.java:2525
-#: build/trans_presets.java:2526 build/trans_presets.java:2527
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:1599 build/trans_presets.java:1600
+#: build/trans_presets.java:1601 build/trans_presets.java:1602
+#: build/trans_presets.java:1617 build/trans_presets.java:1618
+#: build/trans_presets.java:1619 build/trans_presets.java:1620
+#: build/trans_presets.java:1633 build/trans_presets.java:1634
+#: build/trans_presets.java:1635 build/trans_presets.java:1636
+#: build/trans_presets.java:1650 build/trans_presets.java:1651
+#: build/trans_presets.java:1652 build/trans_presets.java:1653
+#: build/trans_presets.java:1668 build/trans_presets.java:1669
+#: build/trans_presets.java:1670 build/trans_presets.java:1671
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1701 build/trans_presets.java:1702
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1718 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1741 build/trans_presets.java:1742
+#: build/trans_presets.java:1743 build/trans_presets.java:1744
+#: build/trans_presets.java:1760 build/trans_presets.java:1761
+#: build/trans_presets.java:1762 build/trans_presets.java:1763
+#: build/trans_presets.java:1777 build/trans_presets.java:1778
+#: build/trans_presets.java:1779 build/trans_presets.java:1780
+#: build/trans_presets.java:1795 build/trans_presets.java:1796
+#: build/trans_presets.java:1797 build/trans_presets.java:1798
+#: build/trans_presets.java:1814 build/trans_presets.java:1815
+#: build/trans_presets.java:1816 build/trans_presets.java:1817
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1832 build/trans_presets.java:1833
+#: 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:1974 build/trans_presets.java:1984
+#: build/trans_presets.java:2654 build/trans_presets.java:2655
+#: build/trans_presets.java:2696 build/trans_presets.java:2705
+#: build/trans_presets.java:2706 build/trans_presets.java:2707
+#: build/trans_presets.java:2997
 msgid "no"
 msgstr "否"
@@ -22677,5 +22912,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3266
+#: build/trans_presets.java:487 build/trans_presets.java:3446
 msgid "hiking"
 msgstr "健行"
@@ -22710,5 +22945,5 @@
 msgstr "良好"
 
-#: build/trans_presets.java:490 build/trans_presets.java:2058
+#: build/trans_presets.java:490 build/trans_presets.java:2238
 msgid "intermediate"
 msgstr "中級"
@@ -22722,5 +22957,13 @@
 msgstr "恐怖的"
 
-#: build/trans_presets.java:499
+#: build/trans_presets.java:499 build/trans_presets.java:1602
+#: build/trans_presets.java:1620 build/trans_presets.java:1636
+#: build/trans_presets.java:1653 build/trans_presets.java:1671
+#: build/trans_presets.java:1688 build/trans_presets.java:1704
+#: build/trans_presets.java:1721 build/trans_presets.java:1744
+#: build/trans_presets.java:1763 build/trans_presets.java:1780
+#: build/trans_presets.java:1798 build/trans_presets.java:1817
+#: build/trans_presets.java:1833 build/trans_presets.java:1850
+#: build/trans_presets.java:1865
 msgid "Wheelchairs"
 msgstr "輪椅"
@@ -22849,4 +23092,12 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Travel/Accomodation/Hotel" text "Name"
+#. item "Travel/Accomodation/Motel" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
@@ -22878,14 +23129,18 @@
 #: build/trans_presets.java:1339 build/trans_presets.java:1382
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
-#: build/trans_presets.java:1403 build/trans_presets.java:1792
-#: build/trans_presets.java:1802 build/trans_presets.java:2249
-#: build/trans_presets.java:2351 build/trans_presets.java:2381
-#: build/trans_presets.java:2434 build/trans_presets.java:2442
-#: build/trans_presets.java:2459 build/trans_presets.java:2472
-#: build/trans_presets.java:2481 build/trans_presets.java:2488
-#: build/trans_presets.java:2553 build/trans_presets.java:2563
-#: build/trans_presets.java:2764 build/trans_presets.java:2781
-#: build/trans_presets.java:2796 build/trans_presets.java:2835
-#: build/trans_presets.java:3273
+#: build/trans_presets.java:1403 build/trans_presets.java:1596
+#: build/trans_presets.java:1614 build/trans_presets.java:1665
+#: build/trans_presets.java:1682 build/trans_presets.java:1735
+#: build/trans_presets.java:1756 build/trans_presets.java:1792
+#: build/trans_presets.java:1810 build/trans_presets.java:1972
+#: build/trans_presets.java:1982 build/trans_presets.java:2429
+#: build/trans_presets.java:2531 build/trans_presets.java:2561
+#: build/trans_presets.java:2614 build/trans_presets.java:2622
+#: build/trans_presets.java:2639 build/trans_presets.java:2652
+#: build/trans_presets.java:2661 build/trans_presets.java:2668
+#: build/trans_presets.java:2733 build/trans_presets.java:2743
+#: build/trans_presets.java:2944 build/trans_presets.java:2961
+#: build/trans_presets.java:2976 build/trans_presets.java:3015
+#: build/trans_presets.java:3453
 msgid "Operator"
 msgstr "經營者"
@@ -23147,12 +23402,12 @@
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Operator"
 #. item "Tourism/Guidepost" text "Name"
 #. item "Geography/Places/Peak" text "Name"
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1772 build/trans_presets.java:2949
-#: build/trans_presets.java:2956 build/trans_presets.java:2963
+#: build/trans_presets.java:739 build/trans_presets.java:1683
+#: build/trans_presets.java:1952 build/trans_presets.java:3129
+#: build/trans_presets.java:3136 build/trans_presets.java:3143
 msgid "Elevation"
 msgstr "海拔"
@@ -23454,5 +23709,5 @@
 #: build/trans_presets.java:952
 msgid "Drain"
-msgstr ""
+msgstr "排水溝"
 
 #. item "Water/Water/Drain"
@@ -23460,5 +23715,5 @@
 #: build/trans_presets.java:954
 msgid "Edit Drain"
-msgstr ""
+msgstr "編輯排水溝"
 
 #. item "Water/Water/Drain" combo "Layer"
@@ -23689,5 +23944,5 @@
 #: build/trans_presets.java:1082
 msgid "Boatyard"
-msgstr ""
+msgstr "造船廠"
 
 #. item "Water/Water/Boatyard"
@@ -23695,5 +23950,5 @@
 #: build/trans_presets.java:1084
 msgid "Edit Boatyard"
-msgstr ""
+msgstr "編輯造船廠"
 
 #. item "Water/Water/Boatyard" text "Name"
@@ -23756,5 +24011,5 @@
 #: build/trans_presets.java:1123
 msgid "Turning Point"
-msgstr ""
+msgstr "調轉點"
 
 #. item "Waterway Point/Turning Point"
@@ -23921,5 +24176,5 @@
 #: build/trans_presets.java:1236
 msgid "contact_line"
-msgstr ""
+msgstr "連接線"
 
 #. color foot
@@ -23997,5 +24252,5 @@
 #: build/trans_style.java:1305 build/trans_style.java:1312
 msgid "rail"
-msgstr ""
+msgstr "軌"
 
 #. item "Man Made/Power Line" text "Line reference"
@@ -24004,5 +24259,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2462
+#: build/trans_presets.java:1237 build/trans_presets.java:2642
 msgid "Voltage"
 msgstr "電壓"
@@ -24164,5 +24419,5 @@
 #: build/trans_presets.java:1288
 msgid "Buffer Stop"
-msgstr ""
+msgstr "緩衝停止點"
 
 #. item "Transport/Railway/Buffer Stop"
@@ -24198,5 +24453,5 @@
 #: build/trans_presets.java:1306
 msgid "Cable Car"
-msgstr "纜車"
+msgstr "大型纜車"
 
 #. item "Aerialway/Cable Car"
@@ -24204,10 +24459,10 @@
 #: build/trans_presets.java:1308
 msgid "Edit Cable Car"
-msgstr "編輯纜車"
+msgstr "編輯大型纜車"
 
 #. item "Aerialway/Cable Car" text "Name"
 #: build/trans_presets.java:1312
 msgid "Gondola"
-msgstr ""
+msgstr "纜車"
 
 #. item "Aerialway/Gondola"
@@ -24215,5 +24470,5 @@
 #: build/trans_presets.java:1314
 msgid "Edit Gondola"
-msgstr ""
+msgstr "編輯纜車"
 
 #. item "Aerialway/Gondola" text "Name"
@@ -24221,5 +24476,5 @@
 msgctxt "aerialway"
 msgid "Station"
-msgstr ""
+msgstr "纜車站"
 
 #. item "Aerialway/Station"
@@ -24228,5 +24483,5 @@
 msgctxt "aerialway"
 msgid "Edit Station"
-msgstr ""
+msgstr "編輯纜車站"
 
 #. item "Aerialway/Station" text "Name"
@@ -24314,6 +24569,8 @@
 
 #. item "Car/Fuel" text "Name"
-#. item "Food+Drinks/Cafe" text "Name"
-#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Restaurant" check "Microbrewery"
+#. item "Food+Drinks/Food Court" text "Name"
+#. item "Food+Drinks/Cafe" text "Operator"
+#. item "Food+Drinks/Pub" check "Microbrewery"
 #. item "Food+Drinks/Biergarten" text "Name"
 #. item "Food+Drinks/Bar" text "Name"
@@ -24365,32 +24622,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1713 build/trans_presets.java:1726
-#: build/trans_presets.java:1740 build/trans_presets.java:1841
-#: build/trans_presets.java:1849 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:2289
-#: build/trans_presets.java:2313 build/trans_presets.java:2554
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1878
+#: build/trans_presets.java:1885 build/trans_presets.java:1893
+#: build/trans_presets.java:1906 build/trans_presets.java:1920
+#: build/trans_presets.java:2021 build/trans_presets.java:2029
+#: build/trans_presets.java:2132 build/trans_presets.java:2138
+#: build/trans_presets.java:2469 build/trans_presets.java:2493
+#: build/trans_presets.java:2734 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Opening Hours"
 msgstr "開放時間"
@@ -24399,4 +24656,5 @@
 #. item "Food+Drinks/Restaurant" combo "Opening Hours"
 #. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Food Court" combo "Opening Hours"
 #. item "Food+Drinks/Cafe" combo "Opening Hours"
 #. item "Food+Drinks/Pub" combo "Opening Hours"
@@ -24449,174 +24707,175 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
 msgid "Mo-Fr 08:30-20:00"
 msgstr "週一-週五 08:30-20:00"
 
-#: build/trans_presets.java:1342 build/trans_presets.java:1646
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1669 build/trans_presets.java:1676
-#: build/trans_presets.java:1683 build/trans_presets.java:1690
-#: build/trans_presets.java:1705 build/trans_presets.java:1713
-#: build/trans_presets.java:1726 build/trans_presets.java:1740
-#: build/trans_presets.java:1841 build/trans_presets.java:1849
-#: build/trans_presets.java:1952 build/trans_presets.java:1958
-#: build/trans_presets.java:2289 build/trans_presets.java:2313
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2596
-#: build/trans_presets.java:2602 build/trans_presets.java:2608
-#: build/trans_presets.java:2615 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2666 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2686
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2717 build/trans_presets.java:2723
-#: build/trans_presets.java:2730 build/trans_presets.java:2737
-#: build/trans_presets.java:2744 build/trans_presets.java:2750
-#: build/trans_presets.java:2756 build/trans_presets.java:2782
-#: build/trans_presets.java:2790 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2819
-#: build/trans_presets.java:2846
-msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+#: build/trans_presets.java:1342 build/trans_presets.java:1738
+#: build/trans_presets.java:1758 build/trans_presets.java:1775
+#: build/trans_presets.java:1793 build/trans_presets.java:1812
+#: build/trans_presets.java:1828 build/trans_presets.java:1845
+#: build/trans_presets.java:1862 build/trans_presets.java:1885
+#: build/trans_presets.java:1893 build/trans_presets.java:1906
+#: build/trans_presets.java:1920 build/trans_presets.java:2021
+#: build/trans_presets.java:2029 build/trans_presets.java:2132
+#: build/trans_presets.java:2138 build/trans_presets.java:2469
+#: build/trans_presets.java:2493 build/trans_presets.java:2756
+#: build/trans_presets.java:2762 build/trans_presets.java:2769
+#: build/trans_presets.java:2776 build/trans_presets.java:2782
+#: build/trans_presets.java:2788 build/trans_presets.java:2795
+#: build/trans_presets.java:2802 build/trans_presets.java:2809
+#: build/trans_presets.java:2815 build/trans_presets.java:2822
+#: build/trans_presets.java:2828 build/trans_presets.java:2834
+#: build/trans_presets.java:2840 build/trans_presets.java:2846
+#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:2866 build/trans_presets.java:2873
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2910
+#: build/trans_presets.java:2917 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2962 build/trans_presets.java:2970
+#: build/trans_presets.java:2985 build/trans_presets.java:2991
+#: build/trans_presets.java:2999 build/trans_presets.java:3026
+#, fuzzy
+msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr "週二-週日 08:00-15:00; 週六 08:00-12:00"
 
 #: build/trans_presets.java:1343
+msgid "With kiosk"
+msgstr ""
+
+#. item "Car/Fuel" check "With kiosk"
+#: build/trans_presets.java:1344
 msgid "Fuel types:"
 msgstr "燃料類型："
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1345
 msgid "Diesel"
-msgstr ""
+msgstr "柴油"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1346
 msgid "Bio Diesel"
-msgstr ""
+msgstr "生質柴油"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1347
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr ""
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1348
 msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
+msgstr "重型貨車柴油"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1349
 msgid "Octane 91"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1350
 msgid "Octane 95"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1351
 msgid "Octane 98"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1352
 msgid "Octane 100"
 msgstr ""
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1353
 msgid "E10 (10% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1354
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1355
 msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
+msgstr "LPG (液化石油氣)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1356
 msgid "CNG (Compressed Natural Gas)"
-msgstr ""
+msgstr "CNG (壓縮天然氣)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1357
 msgid "1/25 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1358
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
-#: build/trans_presets.java:1358
-msgid "With kiosk"
-msgstr ""
-
-#. item "Car/Fuel" check "With kiosk"
 #. </optional>
 #. group "Bicycle"
@@ -24646,7 +24905,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1367 build/trans_presets.java:1793
-#: build/trans_presets.java:1803 build/trans_presets.java:2473
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:1367 build/trans_presets.java:1973
+#: build/trans_presets.java:1983 build/trans_presets.java:2653
+#: build/trans_presets.java:2945
 msgid "Reference number"
 msgstr ""
@@ -24662,5 +24921,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2383
+#: build/trans_presets.java:1368 build/trans_presets.java:2563
 msgid "underground"
 msgstr "地下"
@@ -24673,6 +24932,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1370 build/trans_presets.java:1794
-#: build/trans_presets.java:1804 build/trans_presets.java:2474
+#: build/trans_presets.java:1370 build/trans_presets.java:1974
+#: build/trans_presets.java:1984 build/trans_presets.java:2654
 msgid "Fee"
 msgstr "費用"
@@ -24698,5 +24957,5 @@
 #: build/trans_presets.java:1376
 msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
+msgstr "查閱 Wiki 上的其他容量:[types]=*。"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
@@ -24736,5 +24995,5 @@
 #: build/trans_presets.java:1398
 msgid "Sharing"
-msgstr ""
+msgstr "汽車分享"
 
 #. item "Car/Sharing"
@@ -24742,5 +25001,5 @@
 #: build/trans_presets.java:1400
 msgid "Edit Car Sharing"
-msgstr ""
+msgstr "編輯汽車分享"
 
 #. item "Bicycle/Parking"
@@ -24774,10 +25033,10 @@
 msgctxt "railway"
 msgid "Edit Station"
-msgstr ""
+msgstr "編輯火車站"
 
 #. item "Public Transport/Station" text "Name"
 #: build/trans_presets.java:1431
 msgid "UIC-Reference"
-msgstr ""
+msgstr "UIC-參考"
 
 #. item "Public Transport/Station" text "UIC-Reference"
@@ -24848,5 +25107,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2475
+#: build/trans_presets.java:1471 build/trans_presets.java:2655
 msgid "Wheelchair"
 msgstr "輪椅"
@@ -24883,12 +25142,12 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1494 build/trans_presets.java:1816
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:1494 build/trans_presets.java:1996
+#: build/trans_presets.java:2705
 msgid "Shelter"
-msgstr ""
+msgstr "涼亭"
 
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2513
+#: build/trans_presets.java:1495 build/trans_presets.java:2693
 msgid "Bench"
 msgstr "長椅"
@@ -25007,5 +25266,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2579
 msgid "Beacon"
 msgstr ""
@@ -25065,11 +25324,241 @@
 msgstr "編輯旅館"
 
-#. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1596
+#. item "Travel/Accomodation/Hotel" text "Operator"
+#. item "Travel/Accomodation/Motel" text "Operator"
+#. item "Travel/Accomodation/Guest House" text "Name"
+#. item "Travel/Accomodation/Chalet" text "Name"
+#. item "Travel/Accomodation/Hostel" text "Operator"
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1597 build/trans_presets.java:1615
+#: build/trans_presets.java:1631 build/trans_presets.java:1648
+#: build/trans_presets.java:1666 build/trans_presets.java:1699
+#: build/trans_presets.java:1716 build/trans_presets.java:1739
 msgid "Stars"
 msgstr "星級"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1598
+#. <space />
+#. item "Travel/Accomodation/Motel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Guest House" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Chalet" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Hostel" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#. <space />
+#. item "Travel/Accomodation/Caravan Site" combo "Stars"
+#. <space />
+#. item "Travel/Accomodation/Camping Site" combo "Stars"
+#. <space />
+#. item "Food+Drinks/Restaurant" combo "Stars"
+#. <space />
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "Internet access"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wlan"
+msgstr ""
+
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847
+msgid "wired"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_presets.java:1599 build/trans_presets.java:1617
+#: build/trans_presets.java:1633 build/trans_presets.java:1650
+#: build/trans_presets.java:1668 build/trans_presets.java:1685
+#: build/trans_presets.java:1701 build/trans_presets.java:1718
+#: build/trans_presets.java:1741 build/trans_presets.java:1760
+#: build/trans_presets.java:1777 build/trans_presets.java:1795
+#: build/trans_presets.java:1814 build/trans_presets.java:1830
+#: build/trans_presets.java:1847 build/trans_style.java:1352
+msgid "terminal"
+msgstr ""
+
+#: build/trans_presets.java:1600 build/trans_presets.java:1618
+#: build/trans_presets.java:1634 build/trans_presets.java:1651
+#: build/trans_presets.java:1669 build/trans_presets.java:1686
+#: build/trans_presets.java:1702 build/trans_presets.java:1719
+#: build/trans_presets.java:1742 build/trans_presets.java:1761
+#: build/trans_presets.java:1778 build/trans_presets.java:1796
+#: build/trans_presets.java:1815 build/trans_presets.java:1831
+#: build/trans_presets.java:1848
+msgid "Internet access fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "Smoking"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "dedicated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "separated"
+msgstr ""
+
+#: build/trans_presets.java:1601 build/trans_presets.java:1619
+#: build/trans_presets.java:1635 build/trans_presets.java:1652
+#: build/trans_presets.java:1670 build/trans_presets.java:1687
+#: build/trans_presets.java:1703 build/trans_presets.java:1720
+#: build/trans_presets.java:1743 build/trans_presets.java:1762
+#: build/trans_presets.java:1779 build/trans_presets.java:1797
+#: build/trans_presets.java:1816 build/trans_presets.java:1832
+#: build/trans_presets.java:1849 build/trans_presets.java:1864
+msgid "isolated"
+msgstr ""
+
+#. <space />
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:1604 build/trans_presets.java:1622
+#: build/trans_presets.java:1638 build/trans_presets.java:1655
+#: build/trans_presets.java:1673 build/trans_presets.java:1690
+#: build/trans_presets.java:1706 build/trans_presets.java:1723
+#: build/trans_presets.java:1746 build/trans_presets.java:1765
+#: build/trans_presets.java:1782 build/trans_presets.java:1800
+#: build/trans_presets.java:1819 build/trans_presets.java:1835
+#: build/trans_presets.java:1852 build/trans_presets.java:1867
+#: build/trans_presets.java:3016
+msgid "Phone Number"
+msgstr "電話號碼"
+
+#. item "Travel/Accomodation/Hotel" text "Phone Number"
+#. item "Travel/Accomodation/Motel" text "Phone Number"
+#. item "Travel/Accomodation/Guest House" text "Phone Number"
+#. item "Travel/Accomodation/Chalet" text "Phone Number"
+#. item "Travel/Accomodation/Hostel" text "Phone Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Phone Number"
+#. item "Travel/Accomodation/Caravan Site" text "Phone Number"
+#. item "Travel/Accomodation/Camping Site" text "Phone Number"
+#. item "Food+Drinks/Restaurant" text "Phone Number"
+#. item "Food+Drinks/Fast Food" text "Phone Number"
+#. item "Food+Drinks/Food Court" text "Phone Number"
+#. item "Food+Drinks/Cafe" text "Phone Number"
+#. item "Food+Drinks/Pub" text "Phone Number"
+#. item "Food+Drinks/Biergarten" text "Phone Number"
+#. item "Food+Drinks/Bar" text "Phone Number"
+#. item "Food+Drinks/Nightclub" text "Phone Number"
+#: build/trans_presets.java:1605 build/trans_presets.java:1623
+#: build/trans_presets.java:1639 build/trans_presets.java:1656
+#: build/trans_presets.java:1674 build/trans_presets.java:1691
+#: build/trans_presets.java:1707 build/trans_presets.java:1724
+#: build/trans_presets.java:1747 build/trans_presets.java:1766
+#: build/trans_presets.java:1783 build/trans_presets.java:1801
+#: build/trans_presets.java:1820 build/trans_presets.java:1836
+#: build/trans_presets.java:1853 build/trans_presets.java:1868
+msgid "Fax Number"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Fax Number"
+#. item "Travel/Accomodation/Motel" text "Fax Number"
+#. item "Travel/Accomodation/Guest House" text "Fax Number"
+#. item "Travel/Accomodation/Chalet" text "Fax Number"
+#. item "Travel/Accomodation/Hostel" text "Fax Number"
+#. item "Travel/Accomodation/Alpine Hut" text "Fax Number"
+#. item "Travel/Accomodation/Caravan Site" text "Fax Number"
+#. item "Travel/Accomodation/Camping Site" text "Fax Number"
+#. item "Food+Drinks/Restaurant" text "Fax Number"
+#. item "Food+Drinks/Fast Food" text "Fax Number"
+#. item "Food+Drinks/Food Court" text "Fax Number"
+#. item "Food+Drinks/Cafe" text "Fax Number"
+#. item "Food+Drinks/Pub" text "Fax Number"
+#. item "Food+Drinks/Biergarten" text "Fax Number"
+#. item "Food+Drinks/Bar" text "Fax Number"
+#. item "Food+Drinks/Nightclub" text "Fax Number"
+#: build/trans_presets.java:1606 build/trans_presets.java:1624
+#: build/trans_presets.java:1640 build/trans_presets.java:1657
+#: build/trans_presets.java:1675 build/trans_presets.java:1692
+#: build/trans_presets.java:1708 build/trans_presets.java:1725
+#: build/trans_presets.java:1748 build/trans_presets.java:1767
+#: build/trans_presets.java:1784 build/trans_presets.java:1802
+#: build/trans_presets.java:1821 build/trans_presets.java:1837
+#: build/trans_presets.java:1854 build/trans_presets.java:1869
+msgid "Website"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Website"
+#. item "Travel/Accomodation/Motel" text "Website"
+#. item "Travel/Accomodation/Guest House" text "Website"
+#. item "Travel/Accomodation/Chalet" text "Website"
+#. item "Travel/Accomodation/Hostel" text "Website"
+#. item "Travel/Accomodation/Alpine Hut" text "Website"
+#. item "Travel/Accomodation/Caravan Site" text "Website"
+#. item "Travel/Accomodation/Camping Site" text "Website"
+#. item "Food+Drinks/Restaurant" text "Website"
+#. item "Food+Drinks/Fast Food" text "Website"
+#. item "Food+Drinks/Food Court" text "Website"
+#. item "Food+Drinks/Cafe" text "Website"
+#. item "Food+Drinks/Pub" text "Website"
+#. item "Food+Drinks/Biergarten" text "Website"
+#. item "Food+Drinks/Bar" text "Website"
+#. item "Food+Drinks/Nightclub" text "Website"
+#: build/trans_presets.java:1607 build/trans_presets.java:1625
+#: build/trans_presets.java:1641 build/trans_presets.java:1658
+#: build/trans_presets.java:1676 build/trans_presets.java:1693
+#: build/trans_presets.java:1709 build/trans_presets.java:1726
+#: build/trans_presets.java:1749 build/trans_presets.java:1768
+#: build/trans_presets.java:1785 build/trans_presets.java:1803
+#: build/trans_presets.java:1822 build/trans_presets.java:1838
+#: build/trans_presets.java:1855 build/trans_presets.java:1870
+msgid "Email Address"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Email Address"
+#: build/trans_presets.java:1609
 msgid "Motel"
 msgstr "汽車旅館"
@@ -25077,20 +25566,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1611
 msgid "Edit Motel"
 msgstr "編輯汽車旅館"
 
-#. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1604
+#. item "Travel/Accomodation/Motel" text "Email Address"
+#: build/trans_presets.java:1627
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1628
 msgid "Edit Guest House"
 msgstr ""
 
-#. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1609
+#. item "Travel/Accomodation/Guest House" text "Email Address"
+#: build/trans_presets.java:1643
 msgid "Chalet"
 msgstr "小木屋"
@@ -25098,10 +25587,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1645
 msgid "Edit Chalet"
 msgstr "編輯小木屋"
 
-#. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1615
+#. item "Travel/Accomodation/Chalet" text "Email Address"
+#: build/trans_presets.java:1660
 msgid "Hostel"
 msgstr "招待所"
@@ -25109,30 +25598,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1662
 msgid "Edit Hostel"
 msgstr "編輯招待所"
 
-#. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1621
+#. item "Travel/Accomodation/Hostel" text "Email Address"
+#: build/trans_presets.java:1678
 msgid "Alpine Hut"
 msgstr "高山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1679
 msgid "Edit Alpine Hut"
 msgstr "編輯高山小屋"
 
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1627
+#. item "Travel/Accomodation/Alpine Hut" text "Email Address"
+#: build/trans_presets.java:1695
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1696
 msgid "Edit Caravan Site"
 msgstr ""
 
-#. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1632
+#. item "Travel/Accomodation/Caravan Site" text "Email Address"
+#: build/trans_presets.java:1711
 msgid "Camping Site"
 msgstr "露營區"
@@ -25140,10 +25629,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1713
 msgid "Edit Camping Site"
 msgstr "編輯露營區"
 
-#. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1639
+#. item "Travel/Accomodation/Camping Site" text "Email Address"
+#: build/trans_presets.java:1729
 msgid "Food+Drinks"
 msgstr "食物+飲料"
@@ -25154,5 +25643,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1640 build/trans_surveyor.java:47
+#: build/trans_presets.java:1730 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐廳"
@@ -25160,11 +25649,11 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1732
 msgid "Edit Restaurant"
 msgstr "編輯餐廳"
 
-#. item "Food+Drinks/Restaurant" text "Name"
-#. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#. item "Food+Drinks/Restaurant" text "Operator"
+#. item "Food+Drinks/Fast Food" text "Operator"
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "Cuisine"
 msgstr "烹調風格"
@@ -25172,78 +25661,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "italian"
-msgstr "意大利文"
-
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgstr "義式料理"
+
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "chinese"
-msgstr "中文"
-
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgstr "中式料理"
+
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "pizza"
 msgstr "披薩"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "burger"
 msgstr "漢堡"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "greek"
-msgstr "希臘文"
-
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgstr "希臘料理"
+
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "german"
-msgstr "德文"
-
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgstr "德式料理"
+
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "kebab"
-msgstr ""
-
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgstr "烤肉串"
+
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "asian"
 msgstr "亞洲料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "thai"
-msgstr "泰文"
-
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgstr "泰式料理"
+
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "mexican"
 msgstr "墨西哥料理"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "japanese"
-msgstr "日文"
-
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgstr "日本料理"
+
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "french"
-msgstr ""
-
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+msgstr "法式料理"
+
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sandwich"
 msgstr "三明治"
 
-#: build/trans_presets.java:1645 build/trans_presets.java:1654
+#: build/trans_presets.java:1736 build/trans_presets.java:1757
 msgid "sushi"
 msgstr "壽司"
 
-#: build/trans_presets.java:1647 build/trans_presets.java:1670
+#. item "Food+Drinks/Pub" text "Operator"
+#: build/trans_presets.java:1737 build/trans_presets.java:1811
 msgid "Microbrewery"
 msgstr ""
 
-#. item "Food+Drinks/Restaurant" check "Microbrewery"
-#: build/trans_presets.java:1649
+#. item "Food+Drinks/Restaurant" text "Email Address"
+#: build/trans_presets.java:1751
 msgid "Fast Food"
 msgstr "速食"
@@ -25251,17 +25741,29 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1753
 msgid "Edit Fast Food Restaurant"
 msgstr "編輯速食餐廳"
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1757
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1657
+#. item "Food+Drinks/Fast Food" text "Email Address"
+#: build/trans_presets.java:1770
+msgid "Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
+#: build/trans_presets.java:1772
+msgid "Edit Food Court"
+msgstr ""
+
+#. item "Food+Drinks/Food Court" text "Email Address"
+#: build/trans_presets.java:1787
 msgid "Cafe"
 msgstr "咖啡"
@@ -25269,9 +25771,10 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1659
+#: build/trans_presets.java:1789
 msgid "Edit Cafe"
 msgstr "編輯咖啡廳"
 
-#: build/trans_presets.java:1664
+#. item "Food+Drinks/Cafe" text "Email Address"
+#: build/trans_presets.java:1805
 msgid "Pub"
 msgstr "酒店"
@@ -25279,19 +25782,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1807
 msgid "Edit Pub"
 msgstr "編輯酒店"
 
-#. item "Food+Drinks/Pub" check "Microbrewery"
-#: build/trans_presets.java:1672
+#. item "Food+Drinks/Pub" text "Email Address"
+#: build/trans_presets.java:1824
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1825
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1678
+#. item "Food+Drinks/Biergarten" text "Email Address"
+#: build/trans_presets.java:1840
 msgid "Bar"
 msgstr "酒吧"
@@ -25299,9 +25803,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1842
 msgid "Edit Bar"
 msgstr "編輯酒吧"
 
-#: build/trans_presets.java:1685
+#. item "Food+Drinks/Bar" text "Email Address"
+#: build/trans_presets.java:1857
 msgid "Nightclub"
 msgstr "夜店"
@@ -25309,24 +25814,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1859
 msgid "Edit Nightclub"
 msgstr "編輯夜店"
 
-#: build/trans_presets.java:1693
+#. item "Food+Drinks/Nightclub" text "Email Address"
+#: build/trans_presets.java:1873
 msgid "Tourism"
 msgstr "旅遊相關"
 
 #. group "Tourism"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1874
 msgid "Attraction"
 msgstr "吸引力點"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1875
 msgid "Edit Attraction"
 msgstr "編輯吸引力點"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1880
 msgid "Museum"
 msgstr "博物館"
@@ -25334,9 +25840,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1882
 msgid "Edit Museum"
 msgstr "編輯博物館"
 
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1887
 msgid "Zoo"
 msgstr "動物園"
@@ -25345,9 +25851,9 @@
 #. <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:1710
+#: build/trans_presets.java:1890
 msgid "Edit Zoo"
 msgstr "編輯動物園"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1895
 msgid "Viewpoint"
 msgstr "景點"
@@ -25355,24 +25861,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1897
 msgid "Edit Viewpoint"
 msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1900
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1722
+#: build/trans_presets.java:1902
 msgid "Theme Park"
 msgstr "主題樂園"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1903
 msgid "Edit Theme Park"
 msgstr "編輯主題樂園"
 
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1908
 msgid "Artwork"
 msgstr "藝術工作"
@@ -25380,5 +25886,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1910
 msgid "Edit Artwork"
 msgstr "編輯藝術工作"
@@ -25386,19 +25892,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1915
 msgid "Information Office"
 msgstr "資訊服務處"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1922
 msgid "Map"
 msgstr "地圖"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "topo"
 msgstr ""
@@ -25436,5 +25942,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1747 build/trans_style.java:625
+#: build/trans_presets.java:1927 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25442,28 +25948,28 @@
 msgstr "街"
 
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1927
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "Shown Area"
-msgstr ""
+msgstr "顯示區域"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "city"
 msgstr "城市"
 
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1928
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1749 build/trans_presets.java:1765
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1929 build/trans_presets.java:1945
+#: build/trans_presets.java:1993
 msgid "Closer Description"
 msgstr ""
@@ -25473,5 +25979,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1931 build/trans_presets.java:1954
 msgid "Routes shown for:"
 msgstr ""
@@ -25479,5 +25985,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1932 build/trans_presets.java:1955
 msgid "Hiking"
 msgstr "健走"
@@ -25485,6 +25991,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1753 build/trans_presets.java:1776
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:1933 build/trans_presets.java:1956
+#: build/trans_presets.java:2178
 msgid "Cycling"
 msgstr "自行車"
@@ -25492,5 +25998,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1754 build/trans_presets.java:1777
+#: build/trans_presets.java:1934 build/trans_presets.java:1957
 msgid "Mountainbiking"
 msgstr ""
@@ -25498,6 +26004,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1755 build/trans_presets.java:1778
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:1935 build/trans_presets.java:1958
+#: build/trans_presets.java:2232
 msgid "Skiing"
 msgstr "滑雪"
@@ -25505,5 +26011,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1756 build/trans_presets.java:1779
+#: build/trans_presets.java:1936 build/trans_presets.java:1959
 msgid "Riding"
 msgstr ""
@@ -25511,46 +26017,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1757 build/trans_presets.java:1780
+#: build/trans_presets.java:1937 build/trans_presets.java:1960
 msgid "... other transportation modes possible"
-msgstr ""
+msgstr "... 其他可能的運輸模式"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1939
 msgid "Information Board"
 msgstr "資訊板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "history"
 msgstr "歷史"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "wildlife"
 msgstr "野生"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1944
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1947
 msgid "Guidepost"
 msgstr "路牌"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1962
 msgid "Flagpole"
 msgstr ""
@@ -25559,5 +26065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1966
 msgid "Information Terminal"
 msgstr ""
@@ -25565,55 +26071,55 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1791 build/trans_presets.java:1801
+#: build/trans_presets.java:1971 build/trans_presets.java:1981
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1976
 msgid "Audioguide"
-msgstr ""
+msgstr "語音導覽"
 
 #. <space />
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1986
 msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "是否透過行動電話使用語音導覽？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1987
 msgid "Phone number"
 msgstr "電話號碼"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1989
 msgid "Other Information Points"
 msgstr "其他的資訊點"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1817
+#: build/trans_presets.java:1997
 msgid "Edit Shelter"
-msgstr ""
+msgstr "編輯涼亭"
 
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1820 build/trans_presets.java:1826
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
 msgid "Fireplace"
 msgstr "壁爐"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:2002
 msgid "Picnic Site"
 msgstr "野餐區"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:2003
 msgid "Edit Picnic Site"
 msgstr "編輯野餐區"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:2009
 msgid "Historic Places"
 msgstr "歷史地區"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:2010
 msgid "Castle"
 msgstr "城堡"
@@ -25622,19 +26128,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:1833
+#: build/trans_presets.java:2013
 msgid "Edit Castle"
 msgstr "編輯城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:2017
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:2018
 msgid "Edit Ruins"
 msgstr "編輯遺跡"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:2023
 msgid "Archaeological Site"
 msgstr "考古學地區"
@@ -25643,9 +26149,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:1846
+#: build/trans_presets.java:2026
 msgid "Edit Archaeological Site"
 msgstr "編輯考古學地區"
 
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2031
 msgid "Battlefield"
 msgstr "戰場"
@@ -25653,10 +26159,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:2033
 msgid "Edit Battlefield"
 msgstr "編輯戰場"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2037
 msgid "Palaeontological Site"
 msgstr ""
@@ -25664,5 +26170,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:2039
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -25670,15 +26176,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:2044
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:2045
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2049
 msgid "Memorial"
 msgstr "紀念碑"
@@ -25686,55 +26192,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:2051
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2055
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:2056
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2060
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2061
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:2065
 msgid "Boundary Stone"
 msgstr "邊界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:2066
 msgid "Edit Boundary Stone"
 msgstr "編輯邊界石"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2071
 msgid "Leisure"
 msgstr "休閒"
 
 #. group "Leisure"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2072
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1893
+#: build/trans_presets.java:2073
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2077
 msgid "Playground"
 msgstr "運動場"
@@ -25742,35 +26248,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:2079
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2083
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2084
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1910 build/trans_presets.java:2746
+#: build/trans_presets.java:2090 build/trans_presets.java:2926
 msgid "Sports"
 msgstr "運動用品"
 
 #. group "Sports"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2091
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:2092
 msgid "Stadium"
 msgstr "競技場"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:2093
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -25784,6 +26290,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1944
+#: build/trans_presets.java:2097 build/trans_presets.java:2106
+#: build/trans_presets.java:2115 build/trans_presets.java:2124
 msgid "select sport:"
 msgstr "選擇運動："
@@ -26199,6 +26705,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 #: build/trans_style.java:3746 build/trans_style.java:3754
 #: build/trans_style.java:3762 build/trans_style.java:3770
@@ -26233,240 +26739,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "multi"
 msgstr "多種"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "athletics"
 msgstr "田徑"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "american_football"
-msgstr ""
-
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgstr "美式足球"
+
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "basketball"
 msgstr "籃球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "bowls"
 msgstr "保齡球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canadian_football"
-msgstr ""
-
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+msgstr "加拿大足球"
+
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "canoe"
 msgstr "獨木舟"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "cycling"
 msgstr "自行車"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "dog_racing"
 msgstr "賽狗"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "equestrian"
 msgstr "馬術"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "golf"
 msgstr "高爾夫"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "gymnastics"
 msgstr "體操"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "horse_racing"
 msgstr "賽馬"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "motor"
 msgstr "摩托車"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "shooting"
 msgstr "射擊"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1937 build/trans_presets.java:1946
+#: build/trans_presets.java:2099 build/trans_presets.java:2108
+#: build/trans_presets.java:2117 build/trans_presets.java:2126
 msgid "tennis"
 msgstr "網球"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:2101
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2102
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:2110
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:2111
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:2119
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2120
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2128
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:2129
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:2134
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:2135
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2141
 msgid "Sport"
 msgstr "運動"
 
 #. group "Sport"
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:2142
 msgid "Multi"
 msgstr "多種"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:2143
 msgid "Edit Multi"
 msgstr "編輯多種"
@@ -26508,23 +27014,23 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "type"
 msgstr "類型"
@@ -26566,211 +27072,211 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "sports_centre"
 msgstr "運動中心"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "stadium"
 msgstr "競技揚"
 
-#: build/trans_presets.java:1966 build/trans_presets.java:1972
-#: build/trans_presets.java:1978 build/trans_presets.java:1984
-#: build/trans_presets.java:1990 build/trans_presets.java:1996
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
-#: build/trans_presets.java:2014 build/trans_presets.java:2020
-#: build/trans_presets.java:2026 build/trans_presets.java:2032
-#: build/trans_presets.java:2038 build/trans_presets.java:2044
-#: build/trans_presets.java:2050 build/trans_presets.java:2059
-#: build/trans_presets.java:2066 build/trans_presets.java:2074
-#: build/trans_presets.java:2080 build/trans_presets.java:2086
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2128 build/trans_presets.java:2134
-#: build/trans_presets.java:2140 build/trans_presets.java:2146
-#: build/trans_presets.java:2152 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2170
-#: build/trans_presets.java:2176 build/trans_presets.java:2182
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2146 build/trans_presets.java:2152
+#: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182 build/trans_presets.java:2188
+#: build/trans_presets.java:2194 build/trans_presets.java:2200
+#: build/trans_presets.java:2206 build/trans_presets.java:2212
+#: build/trans_presets.java:2218 build/trans_presets.java:2224
+#: build/trans_presets.java:2230 build/trans_presets.java:2239
+#: build/trans_presets.java:2246 build/trans_presets.java:2254
+#: build/trans_presets.java:2260 build/trans_presets.java:2266
+#: build/trans_presets.java:2272 build/trans_presets.java:2278
+#: build/trans_presets.java:2284 build/trans_presets.java:2290
+#: build/trans_presets.java:2296 build/trans_presets.java:2302
+#: build/trans_presets.java:2308 build/trans_presets.java:2314
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2350
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:2148
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:2149
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:2154
 msgid "Athletics"
 msgstr "田徑"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:2155
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:2160
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:2161
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:2166
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:2167
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2172
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:2173
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2179
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2184
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2185
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2190
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2191
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2196
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2197
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2202
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2203
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2208
 msgid "Motor Sports"
 msgstr "摩托車運動"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2209
 msgid "Edit Motor Sports"
 msgstr "編輯摩托車運動"
 
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2214
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2215
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2220
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2221
 msgid "Edit Skateboard"
 msgstr "編輯滑板"
 
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2226
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2227
 msgid "Edit Swimming"
 msgstr "編輯游泳"
@@ -26778,52 +27284,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2234
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2237
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "advanced"
 msgstr "進階"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "expert"
 msgstr "專家"
 
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2238
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2241
 msgid "Shooting"
 msgstr "射擊"
@@ -26831,204 +27337,204 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2243
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2249
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2250
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2251
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2256
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2257
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2262
 msgid "American Football"
-msgstr ""
+msgstr "美式足球"
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2263
 msgid "Edit American Football"
-msgstr ""
-
-#: build/trans_presets.java:2088
+msgstr "編輯美式足球"
+
+#: build/trans_presets.java:2268
 msgid "Canadian Football"
-msgstr ""
+msgstr "加拿大足球"
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2269
 msgid "Edit Canadian Football"
-msgstr ""
-
-#: build/trans_presets.java:2094
+msgstr "編輯加拿大足球"
+
+#: build/trans_presets.java:2274
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2275
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2280
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2281
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2286
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2287
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2292
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2293
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2298
 msgid "Basketball"
 msgstr "籃球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2299
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2304
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2305
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2308
 msgid "golf_course"
 msgstr "高爾夫路線"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2310
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2311
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2316
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2317
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2322
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2323
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2328
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2329
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2334
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2335
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2340
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2341
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2346
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2347
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2352
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2353
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2358
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2359
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2364
 msgid "Tennis"
 msgstr "網球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2365
 msgid "Edit Tennis"
 msgstr "編輯網路"
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2372
 msgid "Man-Made"
 msgstr "人造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2374
 msgid "Building"
 msgstr "建築物"
@@ -27036,5 +27542,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2377
 msgid "Public Building"
 msgstr "公共建築"
@@ -27042,10 +27548,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2379
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2383
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -27053,10 +27559,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2385
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2389
 msgid "Embassy"
 msgstr "大使館"
@@ -27064,10 +27570,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2391
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2215
+#: build/trans_presets.java:2395
 msgid "Courthouse"
 msgstr "法院"
@@ -27076,10 +27582,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:2218
+#: build/trans_presets.java:2398
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2402
 msgid "Prison"
 msgstr "監獄"
@@ -27088,10 +27594,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:2225
+#: build/trans_presets.java:2405
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2409
 msgid "Police"
 msgstr "警察局"
@@ -27101,10 +27607,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:2233
+#: build/trans_presets.java:2413
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2417
 msgid "Fire Station"
 msgstr "消防隊"
@@ -27113,10 +27619,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:2240
+#: build/trans_presets.java:2420
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2424
 msgid "Post Office"
 msgstr "郵局"
@@ -27124,5 +27630,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2426
 msgid "Edit Post Office"
 msgstr "編輯郵局"
@@ -27130,15 +27636,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2432
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2433
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2437
 msgid "School"
 msgstr "學校"
@@ -27146,10 +27652,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2439
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2443
 msgid "University"
 msgstr "大學"
@@ -27157,10 +27663,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2445
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2449
 msgid "College"
 msgstr "學院"
@@ -27168,5 +27674,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2451
 msgid "Edit College"
 msgstr "編輯學院"
@@ -27174,5 +27680,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2456
 msgid "Cinema"
 msgstr "電影院"
@@ -27181,10 +27687,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:2279
+#: build/trans_presets.java:2459
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2463
 msgid "Library"
 msgstr "圖書館"
@@ -27193,9 +27699,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:2286
+#: build/trans_presets.java:2466
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2471
 msgid "Arts Centre"
 msgstr "美術館"
@@ -27203,10 +27709,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2473
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2477
 msgid "Theatre"
 msgstr "劇院"
@@ -27215,10 +27721,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:2300
+#: build/trans_presets.java:2480
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2484
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -27228,5 +27734,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:2308
+#: build/trans_presets.java:2488
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -27235,6 +27741,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "Religion"
 msgstr "宗教"
@@ -27243,66 +27749,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "jewish"
 msgstr "猶太教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "sikh"
 msgstr "錫克教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2311 build/trans_presets.java:3136
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:2491 build/trans_presets.java:3316
+#: build/trans_presets.java:3325
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "Denomination"
 msgstr "教派"
@@ -27311,81 +27817,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "anglican"
 msgstr "英國國教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "baptist"
 msgstr "浸信會"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "evangelical"
 msgstr "福音派教會"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "methodist"
 msgstr "衛理公會教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "mormon"
 msgstr "摩門教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "orthodox"
 msgstr "東正教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "presbyterian"
 msgstr "長老派教會"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "shia"
 msgstr "什葉派"
 
-#: build/trans_presets.java:2312 build/trans_presets.java:3137
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:2492 build/trans_presets.java:3317
+#: build/trans_presets.java:3326
 msgid "sunni"
 msgstr "遜尼派"
 
 #. <separator/>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2496
 msgid "Addresses"
 msgstr "地址"
@@ -27394,5 +27900,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:2319
+#: build/trans_presets.java:2499
 msgid "Edit Address Information"
 msgstr "編輯地址資訊"
@@ -27400,5 +27906,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2501
 msgid "House number"
 msgstr "門牌號碼"
@@ -27406,25 +27912,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2503
 msgid "House name"
 msgstr "房屋名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2504
 msgid "Street name"
 msgstr "街道名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2505
 msgid "City name"
 msgstr "城市名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2506
 msgid "Post code"
 msgstr "郵遞區號"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2507
 msgid "Country code"
 msgstr "國碼"
@@ -27433,67 +27939,67 @@
 #. <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:2333
+#: build/trans_presets.java:2513
 msgid "Edit Address Interpolation"
-msgstr ""
+msgstr "編輯地址填寫"
 
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "Numbering scheme"
 msgstr "編號規則"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "odd"
 msgstr "奇數"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "even"
 msgstr "偶數"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2515
 msgid "alphabetic"
 msgstr "按字母順序"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2518
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2519
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2520
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2524
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2525
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "Tower type"
 msgstr "塔類型"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "communication"
 msgstr "通訊"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2528
 msgid "observation"
 msgstr "觀測"
 
 #. <optional>
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2530
 msgid "Height (meters)"
 msgstr "高度（米）"
@@ -27501,25 +28007,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2534
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2535
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2539
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2540
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2544
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -27527,10 +28033,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2546
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2550
 msgid "Windmill"
 msgstr "風車"
@@ -27538,10 +28044,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2552
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2556
 msgid "Pipeline"
 msgstr "油管"
@@ -27550,41 +28056,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:2379
+#: build/trans_presets.java:2559
 msgid "Edit Pipeline"
 msgstr "編輯油管"
 
-#: build/trans_presets.java:2382 build/trans_presets.java:2425
+#: build/trans_presets.java:2562 build/trans_presets.java:2605
 msgid "gas"
 msgstr "天然氣"
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2562
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "Location"
 msgstr "位置"
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2563
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2565
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -27594,10 +28100,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:2389
+#: build/trans_presets.java:2569
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2573
 msgid "Crane"
 msgstr "起重機"
@@ -27605,5 +28111,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2575
 msgid "Edit Crane"
 msgstr "編輯起重機"
@@ -27611,10 +28117,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2581
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2585
 msgid "Survey Point"
 msgstr "測量點"
@@ -27622,10 +28128,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2587
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2591
 msgid "Surveillance"
 msgstr "監視"
@@ -27633,23 +28139,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2593
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "outdoor"
 msgstr "戶外"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2596
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2599
 msgid "Power Generator"
 msgstr "發電廠"
@@ -27659,35 +28165,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:2423
+#: build/trans_presets.java:2603
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "wind"
 msgstr "風力"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2605
 msgid "photovoltaic"
 msgstr "光電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2608
 msgid "Power Station"
 msgstr "發電廠"
@@ -27696,10 +28202,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:2431
+#: build/trans_presets.java:2611
 msgid "Edit Power Station"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2617
 msgid "Power Sub Station"
 msgstr ""
@@ -27708,5 +28214,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:2440
+#: build/trans_presets.java:2620
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -27714,10 +28220,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2443 build/trans_presets.java:2460
+#: build/trans_presets.java:2623 build/trans_presets.java:2640
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2625
 msgid "Power Tower"
 msgstr "電塔"
@@ -27728,23 +28234,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:2450
+#: build/trans_presets.java:2630
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2631
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2632
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2634
 msgid "Power Line"
 msgstr "電線"
@@ -27753,20 +28259,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:2457
+#: build/trans_presets.java:2637
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2638
 msgctxt "Power Line"
 msgid "minor_line"
@@ -27774,55 +28280,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2643
 msgid "Amount of Cables"
-msgstr ""
+msgstr "纜線數量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2644
 msgid "single"
-msgstr ""
-
-#: build/trans_presets.java:2464
+msgstr "單線"
+
+#: build/trans_presets.java:2644
 msgid "double"
-msgstr ""
-
-#: build/trans_presets.java:2464
+msgstr "雙線"
+
+#: build/trans_presets.java:2644
 msgid "triple"
-msgstr ""
-
-#: build/trans_presets.java:2464
+msgstr "三線"
+
+#: build/trans_presets.java:2644
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2647
 msgid "Amenities"
 msgstr "便利設施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2648
 msgid "Toilets"
 msgstr "廁所"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2655
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2476 build/trans_presets.java:2766
+#: build/trans_presets.java:2656 build/trans_presets.java:2946
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2658
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2663
 msgid "Telephone"
 msgstr "電話"
@@ -27831,5 +28337,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:2486
+#: build/trans_presets.java:2666
 msgid "Edit Telephone"
 msgstr "編輯電話"
@@ -27837,5 +28343,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2489 build/trans_presets.java:2767
+#: build/trans_presets.java:2669 build/trans_presets.java:2947
 msgid "Coins"
 msgstr "硬幣"
@@ -27843,5 +28349,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2490 build/trans_presets.java:2768
+#: build/trans_presets.java:2670 build/trans_presets.java:2948
 msgid "Notes"
 msgstr ""
@@ -27849,5 +28355,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2491 build/trans_presets.java:2769
+#: build/trans_presets.java:2671 build/trans_presets.java:2949
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -27855,5 +28361,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2492 build/trans_presets.java:2770
+#: build/trans_presets.java:2672 build/trans_presets.java:2950
 msgid "Debit cards"
 msgstr ""
@@ -27861,15 +28367,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2493 build/trans_presets.java:2771
+#: build/trans_presets.java:2673 build/trans_presets.java:2951
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2674
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2676
 msgid "Recycling"
 msgstr "資源回收"
@@ -27878,5 +28384,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:2499
+#: build/trans_presets.java:2679
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -27884,35 +28390,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2681
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2682
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2683
 msgid "Clothes"
 msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2684
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2685
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2686
 msgid "Scrap Metal"
 msgstr "廢金屬"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2688
 msgid "Waste Basket"
 msgstr ""
@@ -27920,5 +28426,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2690
 msgid "Edit Waste Basket"
 msgstr ""
@@ -27927,31 +28433,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2696
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "Material"
 msgstr "材質"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "stone"
 msgstr "石頭"
 
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2697
 msgid "plastic"
 msgstr "塑膠"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "Colour"
 msgstr "顏色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "black"
 msgstr "黑色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "brown"
 msgstr "淺褐色"
@@ -28030,5 +28536,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2518 build/trans_style.java:3198
+#: build/trans_presets.java:2698 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
@@ -28038,31 +28544,31 @@
 msgstr "綠色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "red"
 msgstr "紅色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "blue"
 msgstr "藍色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "gray"
 msgstr "灰色"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2698
 msgid "white"
 msgstr "白色"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2699
 msgid "Amount of Seats"
 msgstr "座椅數量"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2701
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2702
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -28071,30 +28577,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2524 build/trans_presets.java:3006
+#: build/trans_presets.java:2704 build/trans_presets.java:3186
 msgid "Height"
 msgstr "高度"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "low"
 msgstr "低"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "half"
 msgstr "半高"
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2704
 msgid "full"
 msgstr "全高"
 
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2706
 msgid "Hide"
 msgstr "隱藏"
 
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2707
 msgid "Lock"
 msgstr "鎖"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2709
 msgid "Fountain"
 msgstr "噴泉"
@@ -28103,10 +28609,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:2532
+#: build/trans_presets.java:2712
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2716
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -28115,10 +28621,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:2539
+#: build/trans_presets.java:2719
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2723
 msgid "Fire Hydrant"
 msgstr "消防栓"
@@ -28127,5 +28633,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:2546
+#: build/trans_presets.java:2726
 msgid "Edit Fire Hydrant"
 msgstr "編輯消防栓"
@@ -28133,5 +28639,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2729
 msgid "Baby Hatch"
 msgstr "棄嬰保護艙"
@@ -28139,15 +28645,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2731
 msgid "Edit Baby Hatch"
 msgstr "編輯棄嬰保護艙"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2737
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops"
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2738
 msgid "Car Dealer"
 msgstr "汽車經銷商"
@@ -28155,10 +28661,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2740
 msgid "Edit Car Shop"
 msgstr "編輯汽車商店"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2745
 msgid "Bike Dealer"
 msgstr "自行車經銷商"
@@ -28167,28 +28673,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2748
 msgid "Edit Bicycle Shop"
 msgstr "編輯自行車商店"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2752
 msgid "Supermarket"
 msgstr "超級市場"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2753
 msgid "Edit Supermarket"
 msgstr "編輯超級市場"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2758
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2759
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2764
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -28196,9 +28702,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2766
 msgid "Edit Convenience Store"
 msgstr "編輯便利商店"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2771
 msgid "Kiosk"
 msgstr ""
@@ -28206,27 +28712,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2773
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2778
 msgid "Book Store"
 msgstr "書店"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2779
 msgid "Edit Book Store"
 msgstr "編輯書店"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2784
 msgid "Travel Agency"
 msgstr "旅行社"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2785
 msgid "Edit Travel Agency"
 msgstr "編輯旅行社"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2790
 msgid "Butcher"
 msgstr "肉類"
@@ -28234,9 +28740,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2792
 msgid "Edit Butcher"
 msgstr "編輯肉店"
 
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2797
 msgid "Baker"
 msgstr "麵包類"
@@ -28244,9 +28750,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2799
 msgid "Edit Baker"
 msgstr "編輯麵包店"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2804
 msgid "Florist"
 msgstr "花類"
@@ -28254,18 +28760,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2806
 msgid "Edit Florist"
 msgstr "編輯花店"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2811
 msgid "Organic"
 msgstr "有機產品"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2812
 msgid "Edit Organic Shop"
 msgstr "編輯有機產品商店"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2817
 msgid "Alcohol"
 msgstr "酒類"
@@ -28273,54 +28779,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2819
 msgid "Edit Alcohol Shop"
 msgstr "編輯賣酒的商店"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2824
 msgid "Beverages"
 msgstr "飲料類"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2825
 msgid "Edit Beverages Shop"
 msgstr "編輯飲料店"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2830
 msgid "Computer"
 msgstr "電腦類"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2831
 msgid "Edit Computer Shop"
 msgstr "編輯電腦商店"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2836
 msgid "Electronics"
 msgstr "電子材料"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2837
 msgid "Edit Electronics Shop"
 msgstr "編輯電子材料行"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2842
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2843
 msgid "Edit Hifi Shop"
 msgstr "編輯 Hifi 音響店"
 
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2848
 msgid "Furniture"
 msgstr "傢俱類"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2849
 msgid "Edit Furniture Shop"
 msgstr "編輯傢俱店"
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2854
 msgid "Garden Centre"
 msgstr "園藝中心"
@@ -28328,9 +28834,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2856
 msgid "Edit Garden Centre"
 msgstr "編輯園藝中心"
 
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2861
 msgid "Hardware"
 msgstr "硬體"
@@ -28338,9 +28844,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2863
 msgid "Edit Hardware Store"
 msgstr "編輯硬體商店"
 
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2868
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -28348,54 +28854,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2870
 msgid "Edit Do-it-yourself-store"
 msgstr "編輯 DIY 商店"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2875
 msgid "Stationery"
 msgstr "文具類"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2876
 msgid "Edit Stationery Shop"
 msgstr "編輯文具店"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2881
 msgid "Hairdresser"
 msgstr "美髮類"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2882
 msgid "Edit Hairdresser"
 msgstr "編輯美髮店"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2887
 msgid "Shoes"
 msgstr "鞋類"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2888
 msgid "Edit Shoe Shop"
 msgstr "編輯鞋店"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2893
 msgid "Toys"
 msgstr "玩具類"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2894
 msgid "Edit Toy Shop"
 msgstr "編輯玩具店"
 
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2899
 msgid "Video"
 msgstr "影片類"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2900
 msgid "Edit Video Shop"
 msgstr "編輯影片類商店"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2905
 msgid "Dry Cleaning"
 msgstr "乾洗類"
@@ -28403,9 +28909,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2907
 msgid "Edit Dry Cleaning"
 msgstr "編輯乾洗店"
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2912
 msgid "Laundry"
 msgstr "洗衣店"
@@ -28413,9 +28919,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2914
 msgid "Edit Laundry"
 msgstr "編輯洗衣店"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2919
 msgid "Outdoor"
 msgstr "戶外用品"
@@ -28423,24 +28929,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2921
 msgid "Edit Outdoor Shop"
 msgstr "編輯戶外用品店"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2927
 msgid "Edit Sports Shop"
 msgstr "編輯運動用品店"
 
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2932
 msgid "Optician"
 msgstr "眼鏡類"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2933
 msgid "Edit Optician"
 msgstr "編輯眼鏡行"
 
 #. <separator/>
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2939
 msgid "Vending machine"
 msgstr "自動販賣機"
@@ -28448,5 +28954,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2941
 msgid "Edit Vending machine"
 msgstr "編輯自動販賣機"
@@ -28454,97 +28960,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "Vending products"
 msgstr "販賣產品"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "food"
 msgstr "食物"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "sweets"
 msgstr "甜點"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "cigarettes"
 msgstr "菸"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "photos"
 msgstr "相片"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "animal_food"
 msgstr "飼料"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "news_papers"
 msgstr "報紙"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "toys"
 msgstr "玩具"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "stamps"
 msgstr "郵票"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "condoms"
 msgstr "保險套"
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2943
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2952
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2955
 msgid "Cash"
 msgstr "現金"
 
 #. group "Cash"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2956
 msgid "Bank"
 msgstr "銀行"
@@ -28552,14 +29058,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2958
 msgid "Edit Bank"
 msgstr "編輯銀行"
 
-#: build/trans_presets.java:2783 build/trans_presets.java:2792
+#: build/trans_presets.java:2963 build/trans_presets.java:2972
 msgid "Automated Teller Machine"
 msgstr "自動提款機(ATM)"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2965
 msgid "Money Exchange"
 msgstr "金錢兌換所"
@@ -28567,5 +29073,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2967
 msgid "Edit Money Exchange"
 msgstr "編輯金錢兌換所"
@@ -28573,15 +29079,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2974
 msgid "Edit Automated Teller Machine"
 msgstr "編輯自動提款機"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2979
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2980
 msgid "Doctors"
 msgstr "醫師"
@@ -28589,18 +29095,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2982
 msgid "Edit Doctors"
 msgstr "編輯醫師"
 
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2987
 msgid "Dentist"
 msgstr "牙醫"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2988
 msgid "Edit Dentist"
 msgstr "編輯牙醫"
 
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2993
 msgid "Pharmacy"
 msgstr "藥局"
@@ -28608,5 +29114,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2995
 msgid "Edit Pharmacy"
 msgstr "編輯藥局"
@@ -28614,9 +29120,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2997
 msgid "Dispensing"
 msgstr "配藥"
 
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:3001
 msgid "Hospital"
 msgstr "醫院"
@@ -28624,10 +29130,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:3003
 msgid "Edit Hospital"
 msgstr "編輯醫院"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:3007
 msgid "Emergency Access Point"
 msgstr "緊急連絡點"
@@ -28636,5 +29142,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:2830
+#: build/trans_presets.java:3010
 msgid "Edit Emergency Access Point"
 msgstr "編輯緊急連絡點"
@@ -28643,20 +29149,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:3013
 msgid "Point Number"
-msgstr ""
+msgstr "連絡點編號"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:3014
 msgid "Point Name"
-msgstr ""
-
-#. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2836
-msgid "Phone Number"
-msgstr "電話號碼"
+msgstr "連絡點名稱"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:3017
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -28664,5 +29165,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3020
 msgid "Veterinary"
 msgstr "獸醫"
@@ -28671,64 +29172,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:3023
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:3030
 msgid "Geography"
 msgstr "地理學"
 
 #. group "Geography"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3031
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:3032
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3033
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3038
 msgid "Country"
 msgstr "國家"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:3039
 msgid "Edit Country"
 msgstr "編輯國家"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:3044
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:3045
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:3050
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:3051
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:3056
 msgid "County"
 msgstr "縣"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3057
 msgid "Edit County"
 msgstr "編輯縣"
@@ -28736,15 +29237,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:3063
 msgid "City"
 msgstr "市"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3064
 msgid "Edit City"
 msgstr "編輯市"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:3069
 msgid "Town"
 msgstr "鄉/鎮"
@@ -28752,10 +29253,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3071
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3076
 msgid "Suburb"
 msgstr "郊區"
@@ -28763,25 +29264,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3078
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:3083
 msgid "Village"
 msgstr "村/里"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3084
 msgid "Edit Village"
 msgstr "編輯村/里"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3089
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:3090
 msgid "Edit Hamlet"
 msgstr ""
@@ -28789,5 +29290,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3096
 msgid "Locality"
 msgstr ""
@@ -28795,10 +29296,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:3098
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:3103
 msgid "Island"
 msgstr "島嶼"
@@ -28806,10 +29307,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3105
 msgid "Edit Island"
 msgstr "編輯島嶼"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:3110
 msgid "Islet"
 msgstr ""
@@ -28817,5 +29318,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:3112
 msgid "Edit Islet"
 msgstr ""
@@ -28823,5 +29324,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3118
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -28829,10 +29330,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:3120
 msgid "Edit Cave Entrance"
 msgstr "編輯洞窟入口"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3124
 msgid "Peak"
 msgstr "峰"
@@ -28840,10 +29341,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3126
 msgid "Edit Peak"
 msgstr "編輯山峰"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3131
 msgid "Glacier"
 msgstr "冰河"
@@ -28851,10 +29352,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:3133
 msgid "Edit Glacier"
 msgstr "編輯冰河"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3138
 msgid "Volcano"
 msgstr "火山"
@@ -28862,70 +29363,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:3140
 msgid "Edit Volcano"
 msgstr "編輯火山"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:3146
 msgid "Boundaries"
 msgstr "邊界"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:3147
 msgid "National"
 msgstr "國界"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:3148
 msgid "Edit National Boundary"
 msgstr "編輯國界"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:3153
 msgid "Administrative"
 msgstr "行政區"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:3154
 msgid "Edit Administrative Boundary"
 msgstr "編輯行政區邊界"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3159
 msgid "Civil"
 msgstr "城市的"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:3160
 msgid "Edit Civil Boundary"
 msgstr "編輯城市邊界"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3165
 msgid "Political"
 msgstr "政治的"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:3166
 msgid "Edit Political Boundary"
 msgstr "編輯政治的邊界"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:3171
 msgid "National park"
 msgstr "國家公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3172
 msgid "Edit National Park Boundary"
 msgstr "編輯國家公園"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3178
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3179
 msgid "Tree"
 msgstr "樹"
@@ -28934,15 +29435,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:3002
+#: build/trans_presets.java:3182
 msgid "Edit Tree"
 msgstr "編輯樹"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3187
 msgid "Botanical Name"
 msgstr "植物學名"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3189
 msgid "Wood"
 msgstr ""
@@ -28951,5 +29452,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:3012
+#: build/trans_presets.java:3192
 msgid "Edit Wood"
 msgstr ""
@@ -28957,17 +29458,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "coniferous"
 msgstr "松類"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "deciduous"
 msgstr "落葉類"
 
-#: build/trans_presets.java:3015 build/trans_presets.java:3024
+#: build/trans_presets.java:3195 build/trans_presets.java:3204
 msgid "mixed"
 msgstr "混合"
 
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3197
 msgid "Forest"
 msgstr "森林"
@@ -28976,14 +29477,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:3020
+#: build/trans_presets.java:3200
 msgid "Edit Forest Landuse"
 msgstr "編輯森林土地利用"
 
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3206
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3207
 msgid "Edit Nature Reserve"
 msgstr "編輯自然保育"
@@ -28991,25 +29492,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3212
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3213
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3217
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3218
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3222
 msgid "Fell"
 msgstr ""
@@ -29017,10 +29518,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3224
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3228
 msgid "Heath"
 msgstr ""
@@ -29028,5 +29529,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3230
 msgid "Edit Heath"
 msgstr ""
@@ -29034,5 +29535,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3235
 msgid "Farmyard"
 msgstr ""
@@ -29041,45 +29542,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:3058
+#: build/trans_presets.java:3238
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3243
 msgid "Farmland"
 msgstr "農田"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3244
 msgid "Edit Farmland Landuse"
 msgstr "編輯農田土地利用"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3249
 msgid "Meadow"
 msgstr "青草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3250
 msgid "Edit Meadow Landuse"
 msgstr "編輯青草地土地利用"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3255
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3256
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3261
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3262
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -29087,25 +29588,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3268
 msgid "Garden"
 msgstr "花園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3269
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3273
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3274
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3279
 msgid "Village Green"
 msgstr ""
@@ -29113,10 +29614,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3281
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3286
 msgid "Common"
 msgstr ""
@@ -29124,20 +29625,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3108
+#: build/trans_presets.java:3288
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3292
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3293
 msgid "Edit Park"
 msgstr "編輯公園"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3297
 msgid "Recreation Ground"
 msgstr ""
@@ -29145,5 +29646,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3299
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -29151,15 +29652,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3305
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3306
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3311
 msgid "Graveyard"
 msgstr ""
@@ -29167,9 +29668,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3313
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3319
 msgid "Cemetery"
 msgstr ""
@@ -29177,39 +29678,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3321
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3328
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3329
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3334
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3155
+#: build/trans_presets.java:3335
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3340
 msgid "Industrial"
 msgstr "工業區"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3341
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3346
 msgid "Railway land"
 msgstr ""
@@ -29217,15 +29718,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3348
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3353
 msgid "Military"
-msgstr ""
+msgstr "軍事"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3354
 msgid "Edit Military Landuse"
 msgstr ""
@@ -29233,50 +29734,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3360
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3361
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3366
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3367
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3372
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3373
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3378
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3379
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3384
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3385
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -29286,5 +29787,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:3217
+#: build/trans_presets.java:3397
 msgid "Edit Multipolygon"
 msgstr ""
@@ -29296,5 +29797,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3223 build/trans_presets.java:3240
+#: build/trans_presets.java:3403 build/trans_presets.java:3420
 msgid "outer segment"
 msgstr ""
@@ -29302,5 +29803,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3224 build/trans_presets.java:3241
+#: build/trans_presets.java:3404 build/trans_presets.java:3421
 msgid "inner segment"
 msgstr ""
@@ -29308,5 +29809,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3407
 msgid "Boundary"
 msgstr ""
@@ -29317,5 +29818,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:3232
+#: build/trans_presets.java:3412
 msgid "Edit Boundary"
 msgstr ""
@@ -29323,36 +29824,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3416
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3417
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3422
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3423
 msgid "Administration centre"
 msgstr ""
@@ -29360,47 +29861,47 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3426
 msgid "Turn restriction"
-msgstr ""
+msgstr "轉彎限制"
 
 #. item "Relations/Turn restriction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:3429
 msgid "Edit Turn Restriction"
-msgstr ""
+msgstr "編輯轉彎限制"
 
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3431
 msgid "only_straight_on"
 msgstr ""
@@ -29409,15 +29910,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3436
 msgid "from way"
 msgstr "from 路徑"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3437
 msgid "via node or way"
 msgstr "via 節點或路徑"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3438
 msgid "to way"
 msgstr "to 路徑"
@@ -29425,5 +29926,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3261
+#: build/trans_presets.java:3441
 msgid "Route"
 msgstr "路線"
@@ -29432,5 +29933,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3444
 msgid "Edit Route"
 msgstr "編輯路線"
@@ -29438,5 +29939,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "Route type"
 msgstr "路線類型"
@@ -29544,5 +30045,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3266 build/trans_style.java:233
+#: build/trans_presets.java:3446 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29553,17 +30054,17 @@
 msgstr "單車"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "bus"
 msgstr "公車"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ferry"
 msgstr "渡輪"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "ski"
 msgstr ""
@@ -29631,5 +30132,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3266 build/trans_style.java:247
+#: build/trans_presets.java:3446 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
@@ -29639,9 +30140,9 @@
 msgstr "步行"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "tram"
 msgstr "路面電車"
 
-#: build/trans_presets.java:3266
+#: build/trans_presets.java:3446
 msgid "detour"
 msgstr ""
@@ -29655,10 +30156,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3266 build/trans_style.java:1233
+#: build/trans_presets.java:3446 build/trans_style.java:1233
 msgid "subway"
 msgstr "地下鐵"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3449
 msgid "Symbol description"
 msgstr ""
@@ -29666,31 +30167,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3272
+#: build/trans_presets.java:3452
 msgid "Network"
 msgstr "網路"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3274
+#: build/trans_presets.java:3454
 msgid "connection"
 msgstr "連線"
 
-#: build/trans_presets.java:3275
+#: build/trans_presets.java:3455
 msgid "Color (hex)"
 msgstr "顏色(16 進制)"
@@ -29699,30 +30200,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3458
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3279
+#: build/trans_presets.java:3459
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3280
+#: build/trans_presets.java:3460
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3281
+#: build/trans_presets.java:3461
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3282
+#: build/trans_presets.java:3462
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3283
+#: build/trans_presets.java:3463
 msgid "backward halt point"
 msgstr ""
@@ -30900,16 +31401,4 @@
 msgstr ""
 
-#. color aeroway
-#. <icon annotate="true" src="transport/airport.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1352
-msgid "terminal"
-msgstr ""
-
 #. color terminal
 #. <icon annotate="true" src="transport/airport/terminal.png"/>
@@ -32973,5 +33462,5 @@
 #: build/trans_style.java:3426 build/trans_style.java:3434
 msgid "military"
-msgstr ""
+msgstr "軍事"
 
 #. color military
@@ -33536,5 +34025,5 @@
 #: build/trans_surveyor.java:56
 msgid "WC"
-msgstr ""
+msgstr "WC"
 
 #. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
@@ -33665,5 +34154,5 @@
 #: build/trans_validator.java:63
 msgid "barrier used on a way"
-msgstr ""
+msgstr "用於路徑上的障礙物"
 
 #. way  : W : highway == * && barrier == *
@@ -33780,15 +34269,15 @@
 #: build/trans_wms.java:33
 msgid "NPE Maps"
-msgstr ""
+msgstr "NPE Maps"
 
 #. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
 #: build/trans_wms.java:34
 msgid "NPE Maps (Tim)"
-msgstr ""
+msgstr "NPE Maps (Tim)"
 
 #. http://dev.openstreetmap.org/~timsc/wms2/map.php?
 #: build/trans_wms.java:35
 msgid "7th Series (OS7)"
-msgstr ""
+msgstr "7th Series (OS7)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
@@ -33798,20 +34287,20 @@
 #: build/trans_wms.java:39
 msgid "MLIT Japan (ORTHO)"
-msgstr ""
+msgstr "MLIT 日本 (ORTHO)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:40
 msgid "MLIT Japan (ORTHO01)"
-msgstr ""
+msgstr "MLIT 日本 (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:41
 msgid "MLIT Japan (ORTHO02)"
-msgstr ""
+msgstr "MLIT 日本 (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:42
 msgid "MLIT Japan (ORTHO03)"
-msgstr ""
+msgstr "MLIT 日本 (ORTHO03)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
@@ -33827,17 +34316,4 @@
 msgid "Sicily - Italy"
 msgstr ""
-
-#~ msgid "The selected way does not contain the selected node."
-#~ msgid_plural "The selected way does not contain all the selected nodes."
-#~ msgstr[0] "選取的路徑未包含選取的節點。"
-
-#~ msgid "Degrees Minutes Seconds"
-#~ msgstr "度-分-秒格式"
-
-#~ msgid "Enter an upload comment (min. 3 characters)"
-#~ msgstr "請輸入上傳備註（最小 3 個字元）"
-
-#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-#~ msgstr "請輸入這個上傳變更組合的註解 (最少 3 個字元)"
 
 #~ msgid "Open in Browser"
@@ -33909,4 +34385,8 @@
 #~ msgid "Unknown file extension."
 #~ msgstr "不明的延伸檔名。"
+
+#~ msgid "The selected way does not contain the selected node."
+#~ msgid_plural "The selected way does not contain all the selected nodes."
+#~ msgstr[0] "選取的路徑未包含選取的節點。"
 
 #~ msgid ""
@@ -34562,7 +35042,4 @@
 #~ msgid "Show Author Panel"
 #~ msgstr "顯示作者面板"
-
-#~ msgid "Continue anyway"
-#~ msgstr "強制繼續"
 
 #~ msgid "Please select some data"
@@ -34724,4 +35201,7 @@
 #~ msgstr "編輯較難的高山健行"
 
+#~ msgid "Degrees Minutes Seconds"
+#~ msgstr "度-分-秒格式"
+
 #~ msgid "Communication with server failed"
 #~ msgstr "與伺服器溝通失敗"
@@ -34901,4 +35381,7 @@
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "無法讀取載入資源「{0}」。錯誤為 {1}"
+
+#~ msgid "Missing merge target for object with id {0}"
+#~ msgstr "缺少 id {0} 物件的合併目標"
 
 #~ msgid "Expected ID >= 0. Got {0}."
@@ -35073,4 +35556,7 @@
 #~ msgstr "C"
 
+#~ msgid "Enter an upload comment (min. 3 characters)"
+#~ msgstr "請輸入上傳備註（最小 3 個字元）"
+
 #~ msgid "Use all their elements"
 #~ msgstr "使用他們所有的元素"
@@ -35095,4 +35581,7 @@
 #~ "有 {0} 個額外節點用於<br>在伺服器上刪除的路徑 {1} 。<br><br>您是否也想要取"
 #~ "消刪除這個節點？"
+
+#~ msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+#~ msgstr "請輸入這個上傳變更組合的註解 (最少 3 個字元)"
 
 #~ msgid ""
